package/busybox: invert dependency with netcat
Since netcat would be installed before busybox, we don't need to remove a pre-installed 'nc' anymore. If another netcat implementation (e.g. netcat-openbsd) is also enabled, there is no way to tell which would win in the end, especially when we add TLPB, in which case that will be forbidden. So, we don't need to remove anything anymore. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
parent
f3da9ffff0
commit
355eadf4ab
|
@ -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_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) \
|
||||||
$(if $(BR2_PACKAGE_NTP),ntp) \
|
$(if $(BR2_PACKAGE_NTP),ntp) \
|
||||||
|
|
|
@ -9,17 +9,4 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE
|
||||||
NETCAT_LICENSE = GPL-2.0+
|
NETCAT_LICENSE = GPL-2.0+
|
||||||
NETCAT_LICENSE_FILES = COPYING
|
NETCAT_LICENSE_FILES = COPYING
|
||||||
|
|
||||||
# Ensure Busybox gets built/installed before, so that this package
|
|
||||||
# overrides Busybox nc.
|
|
||||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
|
||||||
NETCAT_DEPENDENCIES += busybox
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Netcat doesn't overwrite a pre-existing 'nc' (e.g. from busybox) so
|
|
||||||
# force-remove it.
|
|
||||||
define NETCAT_RMOVE_NC_LINK
|
|
||||||
rm -f $(TARGET_DIR)/usr/bin/nc
|
|
||||||
endef
|
|
||||||
NETCAT_PRE_INSTALL_TARGET_HOOKS += NETCAT_RMOVE_NC_LINK
|
|
||||||
|
|
||||||
$(eval $(autotools-package))
|
$(eval $(autotools-package))
|
||||||
|
|
Loading…
Reference in a new issue