summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-01-28 15:46:50 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2011-01-28 15:46:50 +0100
commit9f199bce78c5298e1316bff8c78299dc1ee73101 (patch)
treec24063c3d88f69a9178f6457ab68af71be739cbd
parent2645004bb5e2f067532e8356694bbe66c4296d9b (diff)
downloadbuildroot-novena-9f199bce78c5298e1316bff8c78299dc1ee73101.tar.gz
buildroot-novena-9f199bce78c5298e1316bff8c78299dc1ee73101.zip
iproute2: ensure it gets built after busybox if both enabled
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/iproute2/iproute2.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk
index c3e96509d..dfb841063 100644
--- a/package/iproute2/iproute2.mk
+++ b/package/iproute2/iproute2.mk
@@ -9,6 +9,12 @@ IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.bz2
IPROUTE2_SITE = http://devresources.linuxfoundation.org/dev/iproute2/download
IPROUTE2_TARGET_SBINS = ctstat genl ifstat ip lnstat nstat routef routel rtacct rtmon rtpr rtstat ss tc
+# 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
+
# If we've got iptables enable xtables support for tc
ifeq ($(BR2_PACKAGE_IPTABLES),y)
IPROUTE2_DEPENDENCIES += iptables