build: add support for declaring package CONFLICTS which only affect selecting built-in packages

Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 42770
2014-10-05 16:41:33 +00:00
parent 646dfde826
commit 5e4789671a
4 changed files with 16 additions and 0 deletions
--- a/include/package-dumpinfo.mk
+++ b/include/package-dumpinfo.mk
@@ -31,6 +31,7 @@ $(if $(MENU),Menu: $(MENU)
 )$(if $(findstring $(PREREQ_CHECK),1),Prereq-Check: 1
 )Version: $(VERSION)
 Depends: $(call PKG_FIXUP_DEPENDS,$(1),$(DEPENDS))
+Conflicts: $(CONFLICTS)
 Menu-Depends: $(MDEPENDS)
 Provides: $(PROVIDES)
 $(if $(VARIANT),Build-Variant: $(VARIANT)