From 812e7e43becbb8bea632016284ea641a3edd888b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 1 Sep 2025 11:01:25 +0200 Subject: [PATCH] package/net-tools: no need for ifconfig+route workarounds with merged-bin With a merged-bin setup, there is no need to move ifconfig and route, as they would already be in the proper place. Signed-off-by: Yann E. MORIN Signed-off-by: Romain Naour --- package/net-tools/net-tools.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk index 0468a00bf0..344abee8b3 100644 --- a/package/net-tools/net-tools.mk +++ b/package/net-tools/net-tools.mk @@ -42,10 +42,16 @@ endef # ifconfig & route reside in /sbin for busybox, so ensure we don't end # up with two versions of those. -define NET_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +ifeq ($(BR2_ROOTFS_MERGED_BIN),) +define NET_TOOLS_INSTALL_MV_BINS mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig mv -f $(TARGET_DIR)/bin/route $(TARGET_DIR)/sbin/route endef +endif + +define NET_TOOLS_INSTALL_TARGET_CMDS + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(NET_TOOLS_INSTALL_MV_BINS) +endef $(eval $(generic-package))