From 2193b55bac7ee6e2f09d3316d75a157142462a25 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 16 Nov 2025 00:08:47 +0100 Subject: [PATCH] package/iputils: fix merged-bin 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 Signed-off-by: Peter Korsgaard --- 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