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 <yann.morin.1998@free.fr> Signed-off-by: Romain Naour <romain.naour@smile.fr>
This commit is contained in:
committed by
Romain Naour
parent
7f0fdc9603
commit
812e7e43be
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user