summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-07-08 11:45:54 +0200
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-07-08 13:08:05 +0200
commitfcc3b9cec2f1babb2e0a545e3ffa232afead32c9 (patch)
treebdadee291c147e94e1d6f3b1a6ae30128caf636d
parent273f23a452527859605be496992a65f28e3ee7c0 (diff)
downloadbuildroot-fcc3b9cec2f1babb2e0a545e3ffa232afead32c9.tar.gz
buildroot-fcc3b9cec2f1babb2e0a545e3ffa232afead32c9.zip
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>
-rw-r--r--package/busybox/busybox.mk1
-rw-r--r--package/iputils/iputils.mk6
2 files changed, 1 insertions, 6 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 812de14ad0..399db06bb9 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_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 13e33898d6..713b0e4abf 100644
--- 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"
OpenPOWER on IntegriCloud