[Buildroot] [PATCH 1/1] package/iputils: fix merged-bin

[Buildroot] [PATCH 1/1] package/iputils: fix merged-bin

[Bernd Kuhls]

mv: '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/bin/arping'
 and '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/sbin/arping'
 are the same file

Fixes:
https://autobuild.buildroot.net/results/dae/daeebb090f6d11d77840dd61add9bc422c6bc2fa/

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
 package/iputils/iputils.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 8e00513229..1a5d3e3678 100644
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -32,10 +32,12 @@ IPUTILS_CONF_OPTS += -DBUILD_ARPING=true
 # move some binaries to the same location as where Busybox installs
 # the corresponding applets, so that we have a single version of the
 # tools (from iputils)
+ifeq ($(BR2_ROOTFS_MERGED_BIN),)
 define IPUTILS_MOVE_ARPING_BINARY
 	mv $(TARGET_DIR)/usr/bin/arping $(TARGET_DIR)/usr/sbin/arping
 endef
 IPUTILS_POST_INSTALL_TARGET_HOOKS += IPUTILS_MOVE_ARPING_BINARY
+endif
 
 else
 IPUTILS_CONF_OPTS += -DBUILD_ARPING=false
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/iputils: fix merged-bin

[Peter Korsgaard]

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

 > mv: '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/bin/arping'
 >  and
 > '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/sbin/arping'
 >  are the same file

 > Fixes:
 > https://autobuild.buildroot.net/results/dae/daeebb090f6d11d77840dd61add9bc422c6bc2fa/

 > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Good catch. I see we have a number of other packages doing something
similar. I'll send patches.

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/iputils: fix merged-bin

[Peter Korsgaard]

>>>>> "Peter" == Peter Korsgaard <peter@korsgaard.com> writes:

>>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:
 >> mv: '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/bin/arping'
 >> and
 >> '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/sbin/arping'
 >> are the same file

 >> Fixes:
 >> https://autobuild.buildroot.net/results/dae/daeebb090f6d11d77840dd61add9bc422c6bc2fa/

 >> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

 > Good catch. I see we have a number of other packages doing something
 > similar. I'll send patches.

Actually those all look fixed already.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 1/1] package/iputils: fix merged-bin

[Petr Vorel]

Hi Bernd, Peter,

> >>>>> "Bernd" == Bernd Kuhls <bernd@kuhls.net> writes:

>  > mv: '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/bin/arping'
>  >  and
>  > '/home/autobuild/autobuild/instance-2/output-1/per-package/iputils/target/usr/sbin/arping'
>  >  are the same file

>  > Fixes:
>  > https://autobuild.buildroot.net/results/dae/daeebb090f6d11d77840dd61add9bc422c6bc2fa/

>  > Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

> Good catch. I see we have a number of other packages doing something
> similar. I'll send patches.

> Committed, thanks.

Thanks both for fixing this!

Kind regards,
Petr
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot