package/busybox: invert dependency with net-tools
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
355eadf4ab
commit
d0966cdd57
|
@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \
|
||||||
|
|
||||||
# Packages that provide commands that may also be busybox applets:
|
# Packages that provide commands that may also be busybox applets:
|
||||||
BUSYBOX_DEPENDENCIES = \
|
BUSYBOX_DEPENDENCIES = \
|
||||||
|
$(if $(BR2_PACKAGE_NET_TOOLS),net-tools) \
|
||||||
$(if $(BR2_PACKAGE_NETCAT),netcat) \
|
$(if $(BR2_PACKAGE_NETCAT),netcat) \
|
||||||
$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
|
$(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \
|
||||||
$(if $(BR2_PACKAGE_NMAP),nmap) \
|
$(if $(BR2_PACKAGE_NMAP),nmap) \
|
||||||
|
|
|
@ -10,11 +10,6 @@ NET_TOOLS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||||
NET_TOOLS_LICENSE = GPL-2.0+
|
NET_TOOLS_LICENSE = GPL-2.0+
|
||||||
NET_TOOLS_LICENSE_FILES = COPYING
|
NET_TOOLS_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
# Install after busybox for the full-blown versions
|
|
||||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
|
||||||
NET_TOOLS_DEPENDENCIES += busybox
|
|
||||||
endif
|
|
||||||
|
|
||||||
define NET_TOOLS_CONFIGURE_CMDS
|
define NET_TOOLS_CONFIGURE_CMDS
|
||||||
(cd $(@D); yes "" | ./configure.sh config.in )
|
(cd $(@D); yes "" | ./configure.sh config.in )
|
||||||
endef
|
endef
|
||||||
|
@ -40,7 +35,8 @@ define NET_TOOLS_BUILD_CMDS
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# install renames conflicting binaries, update does not
|
# install renames conflicting binaries, update does not
|
||||||
# ifconfig & route reside in /sbin for busybox
|
# 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
|
define NET_TOOLS_INSTALL_TARGET_CMDS
|
||||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update
|
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update
|
||||||
mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig
|
mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig
|
||||||
|
|
Loading…
Reference in a new issue