aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-05 17:13:34 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-05 17:13:34 +0000
commitaf7fe5f5e0d6da7b1ecca223d60fdb00a970b4fb (patch)
treeaecdbcf1c4f66b7ab78f7ef247a71521c22cfb13 /package/network
parentdb910597d7377551b66d888abce5fe79645dd013 (diff)
downloadupstream-af7fe5f5e0d6da7b1ecca223d60fdb00a970b4fb.tar.gz
upstream-af7fe5f5e0d6da7b1ecca223d60fdb00a970b4fb.tar.bz2
upstream-af7fe5f5e0d6da7b1ecca223d60fdb00a970b4fb.zip
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
Diffstat (limited to 'package/network')
-rw-r--r--package/network/utils/iproute2/Makefile6
1 files changed, 5 insertions, 1 deletions
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