diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 17:13:34 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 17:13:34 +0000 |
commit | 5121981a9ebc777ecb58f84002b6bd8fd4249b91 (patch) | |
tree | 0073e0ffe2c032df0f123f1f00253ef2d88ea312 /package | |
parent | a402b5c48dc505aebc146eec4b2ca179fc18d7fa (diff) | |
download | upstream-5121981a9ebc777ecb58f84002b6bd8fd4249b91.tar.gz upstream-5121981a9ebc777ecb58f84002b6bd8fd4249b91.tar.bz2 upstream-5121981a9ebc777ecb58f84002b6bd8fd4249b91.zip |
iproute2: add conflict for ip with ip-full
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42774
Diffstat (limited to 'package')
-rw-r--r-- | package/network/utils/iproute2/Makefile | 6 |
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 |