diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2018-07-08 11:45:48 +0200 |
|---|---|---|
| committer | Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> | 2018-07-08 13:08:04 +0200 |
| commit | 355eadf4ab89049bb0a907faf6a1f13d75322808 (patch) | |
| tree | 2b022ba6b7d11172da76722a8f54f68f0fd2c895 | |
| parent | f3da9ffff010d3b5fee984bb20a1f39df4b973f2 (diff) | |
| download | buildroot-355eadf4ab89049bb0a907faf6a1f13d75322808.tar.gz buildroot-355eadf4ab89049bb0a907faf6a1f13d75322808.zip | |
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>
| -rw-r--r-- | package/busybox/busybox.mk | 1 | ||||
| -rw-r--r-- | package/netcat/netcat.mk | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 003909806a..eeb9dc5bac 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -22,6 +22,7 @@ BUSYBOX_LDFLAGS = \ # Packages that provide commands that may also be busybox applets: BUSYBOX_DEPENDENCIES = \ + $(if $(BR2_PACKAGE_NETCAT),netcat) \ $(if $(BR2_PACKAGE_NETCAT_OPENSBSD),netcat-openbsd) \ $(if $(BR2_PACKAGE_NMAP),nmap) \ $(if $(BR2_PACKAGE_NTP),ntp) \ diff --git a/package/netcat/netcat.mk b/package/netcat/netcat.mk index d8b3c930b9..eb7ddcac27 100644 --- a/package/netcat/netcat.mk +++ b/package/netcat/netcat.mk @@ -9,17 +9,4 @@ NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VE NETCAT_LICENSE = GPL-2.0+ 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)) |
