package/busybox: invert dependency with iputils

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 812de14ad0bfb4dffe63aee9bc12526f5a3f3d40..399db06bb9f072998b5d167cf9b4b4db012dda55 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_IPUTILS),iputils) \
        $(if $(BR2_PACKAGE_KMOD),kmod) \
        $(if $(BR2_PACKAGE_LESS),less) \
        $(if $(BR2_PACKAGE_LSOF),lsof) \

diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 13e33898d64f7b2f30a519adfb317df059ce57d0..713b0e4abf9feb8345be1337fdbffcf3a20e304a 100644 (file)
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -17,12 +17,6 @@ IPUTILS_LICENSE = GPL-2.0+, BSD-3-Clause, BSD-4-Clause
 # Only includes a license file for BSD
 IPUTILS_LICENSE_FILES = ninfod/COPYING
 
-# Build after busybox so target ends up with this package's full
-# versions of the applications instead of busybox applets.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IPUTILS_DEPENDENCIES += busybox
-endif
-
 IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\
        CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE"