From mboxrd@z Thu Jan 1 00:00:00 1970 From: Petr Vorel Date: Mon, 17 Jun 2019 22:32:36 +0200 Subject: [Buildroot] [PATCH 2/2] package/iputils: fix IPUTILS_PERMISSIONS In-Reply-To: <20190616200919.4378-2-thomas.petazzoni@bootlin.com> References: <20190616200919.4378-1-thomas.petazzoni@bootlin.com> <20190616200919.4378-2-thomas.petazzoni@bootlin.com> Message-ID: <20190617203235.GB8498@x230> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net Hi Thomas, > The IPUTILS_PERMISSIONS variable was wrong, because iputils installs > its programs in /usr/bin, not in /bin. It probably was only tested > with the merged /usr option enabled. > This commit fixes IPUTILS_PERMISSIONS, taking into account the change > done in "package/iputils: move binaries to the location also used by > Busybox": > - arping is moved by the post-install target hook to /usr/sbin > - clockdiff is installed by iputils in /usr/bin > - ping is moved by the post-install target hook to /bin, which makes > the previously incorrect path in IPUTILS_PERMISSIONS now correct > Fixes: > http://autobuild.buildroot.net/results/fe378bca29c86a681ba9ad40386cb89248195c50/ > Signed-off-by: Thomas Petazzoni > --- > package/iputils/iputils.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk > index fbf586729b..394c19a943 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -65,9 +65,9 @@ IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_BINARIES > # handle permissions ourselves > IPUTILS_CONF_OPTS += -DNO_SETCAP_OR_SUID=true > define IPUTILS_PERMISSIONS > - /bin/arping f 4755 0 0 - - - - - > - /bin/clockdiff f 4755 0 0 - - - - - > - /bin/ping f 4755 0 0 - - - - - > + /usr/sbin/arping f 4755 0 0 - - - - - > + /usr/bin/clockdiff f 4755 0 0 - - - - - > + /bin/ping f 4755 0 0 - - - - - again thanks for the fix and sorry for introducing bug. Acked-by: Petr Vorel The only thing to consider: Upstream doesn't care much about systems without usr merge. I wonder if systems without it (unset BR2_ROOTFS_MERGED_USR), whether we want to have /bin/ping and symlinked it into /usr/bin/ping. I see this is handled for coreutils (COREUTILS_BIN_PROGS). Kind regards, Petr