package/busybox: invert dependency with netcat-openbsd

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 55c3d25b8efd7ef18594133ecab914267679ef63..003909806a36b95168a868e31e1582755089f366 100644 (file)
--- 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_OPENSBSD),netcat-openbsd) \
        $(if $(BR2_PACKAGE_NMAP),nmap) \
        $(if $(BR2_PACKAGE_NTP),ntp) \
        $(if $(BR2_PACKAGE_PCIUTILS),pciutils) \

diff --git a/package/netcat-openbsd/netcat-openbsd.mk b/package/netcat-openbsd/netcat-openbsd.mk
index 5784e4d68e2c70c1d7f51afeae58b8c97035d064..e98b479c4fbe2e8032bac5eb171fdbf8caf9aa71 100644 (file)
--- a/package/netcat-openbsd/netcat-openbsd.mk
+++ b/package/netcat-openbsd/netcat-openbsd.mk
@@ -10,12 +10,6 @@ NETCAT_OPENBSD_LICENSE = BSD-3-Clause
 NETCAT_OPENBSD_LICENSE_FILES = debian/copyright
 NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd
 
-# Ensure Busybox gets built/installed before, so that this package
-# overrides Busybox nc.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-NETCAT_OPENBSD_DEPENDENCIES += busybox
-endif
-
 define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES
        if [ -d $(@D)/debian/patches ]; then \
                $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \