From: Petr Vorel <petr.vorel@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 2/2] package/iputils: fix IPUTILS_PERMISSIONS
Date: Mon, 17 Jun 2019 22:32:36 +0200 [thread overview]
Message-ID: <20190617203235.GB8498@x230> (raw)
In-Reply-To: <20190616200919.4378-2-thomas.petazzoni@bootlin.com>
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 <thomas.petazzoni@bootlin.com>
> ---
> 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 <petr.vorel@gmail.com>
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
next prev parent reply other threads:[~2019-06-17 20:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-16 20:09 [Buildroot] [PATCH 1/2] package/iputils: move binaries to the location also used by Busybox Thomas Petazzoni
2019-06-16 20:09 ` [Buildroot] [PATCH 2/2] package/iputils: fix IPUTILS_PERMISSIONS Thomas Petazzoni
2019-06-17 20:32 ` Petr Vorel [this message]
2019-06-18 6:49 ` Thomas Petazzoni
2019-06-18 7:01 ` Petr Vorel
2019-06-16 20:20 ` [Buildroot] [PATCH 1/2] package/iputils: move binaries to the location also used by Busybox Yann E. MORIN
2019-06-17 17:31 ` Thomas Petazzoni
2019-06-17 20:24 ` Petr Vorel
2019-06-18 6:46 ` Thomas Petazzoni
2019-06-18 6:59 ` Petr Vorel
2019-06-18 7:17 ` Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190617203235.GB8498@x230 \
--to=petr.vorel@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.