From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 5 Oct 2014 17:13:34 +0000 (+0000)
Subject: iproute2: add conflict for ip with ip-full
X-Git-Tag: reboot~5765
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5121981a9ebc777ecb58f84002b6bd8fd4249b91;p=openwrt%2Fstaging%2Flynxis.git

iproute2: add conflict for ip with ip-full

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42774
---

diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index b58a5ab453..e2f4b0218a 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -31,7 +31,11 @@ define Package/iproute2/Default
   VARIANT:=$(1)
 endef
 
-Package/ip=$(call Package/iproute2/Default,tiny,Minimal)
+define Package/ip
+$(call Package/iproute2/Default,tiny,Minimal)
+  CONFLICTS:=ip-full
+endef
+
 Package/ip-full=$(call Package/iproute2/Default,full,Full)
 
 define Package/ip/conffiles