From 9f199bce78c5298e1316bff8c78299dc1ee73101 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 28 Jan 2011 15:46:50 +0100 Subject: [PATCH] iproute2: ensure it gets built after busybox if both enabled Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index c3e96509d6..dfb841063a 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 -- 2.30.2