package/busybox: invert dependency with iproute2
authorYann E. MORIN <yann.morin.1998@free.fr>
Sun, 8 Jul 2018 09:45:55 +0000 (11:45 +0200)
committerArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Sun, 8 Jul 2018 11:08:05 +0000 (13:08 +0200)
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
package/busybox/busybox.mk
package/iproute2/iproute2.mk

index 399db06bb9f072998b5d167cf9b4b4db012dda55..a7823d82aeddfe949bd07bd7e4bde8dce9764593 100644 (file)
@@ -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) \
index 1f276ac7ed12ff9f9304f1b2e4963244dc65ea45..48413401cd6ebb392c1291d9ceb5b59098166344 100644 (file)
@@ -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