summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2018-07-08 11:45:55 +0200
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2018-07-08 13:08:05 +0200
commitb83204d038b5f948c20235e677725f9312cfb2a4 (patch)
tree98a95ab2783957ac5fc597647ac6d67e81cc0bd7
parentfcc3b9cec2f1babb2e0a545e3ffa232afead32c9 (diff)
downloadbuildroot-b83204d038b5f948c20235e677725f9312cfb2a4.tar.gz
buildroot-b83204d038b5f948c20235e677725f9312cfb2a4.zip
package/busybox: invert dependency with iproute2
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/iproute2/iproute2.mk6
2 files changed, 1 insertions, 6 deletions
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 399db06bb9..a7823d82ae 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_IPROUTE2),iproute2) \
$(if $(BR2_PACKAGE_IPUTILS),iputils) \
$(if $(BR2_PACKAGE_KMOD),kmod) \
$(if $(BR2_PACKAGE_LESS),less) \
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index 1f276ac7ed..48413401cd 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -12,12 +12,6 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
IPROUTE2_LICENSE = GPL-2.0+
IPROUTE2_LICENSE_FILES = COPYING
-# If both iproute2 and busybox are selected, make certain we win
-# the fight over who gets to have their utils actually installed.
-ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-IPROUTE2_DEPENDENCIES += busybox
-endif
-
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
IPROUTE2_DEPENDENCIES += elfutils
endif
OpenPOWER on IntegriCloud