From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 5 Oct 2014 17:13:34 +0000 (+0000)
Subject: iproute2: add conflict for ip with ip-full
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=b975c4b75eb9d32b3b6ee50434ec52e6fc02a674;p=openwrt.git

iproute2: add conflict for ip with ip-full

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

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42774 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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