| Message ID | 20190617171747.7713-2-thomas.petazzoni@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] package/iputils: move binaries to the location also used by Busybox | expand |
Both applied to master, thanks. On 17/06/2019 19:17, Thomas Petazzoni wrote: > 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 I've added the has of the actual commit here. Regards, Arnout > 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> > --- > Changes since v1: None > --- > 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 7bd756f040..052110878a 100644 > --- a/package/iputils/iputils.mk > +++ b/package/iputils/iputils.mk > @@ -66,9 +66,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 - - - - - > endef > > $(eval $(meson-package)) >
diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk index 7bd756f040..052110878a 100644 --- a/package/iputils/iputils.mk +++ b/package/iputils/iputils.mk @@ -66,9 +66,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 - - - - - endef $(eval $(meson-package))
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> --- Changes since v1: None --- package/iputils/iputils.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)