aboutsummaryrefslogtreecommitdiffstats
path: root/include/package-dumpinfo.mk
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2014-10-05 16:41:33 +0000
committerFelix Fietkau <nbd@openwrt.org>2014-10-05 16:41:33 +0000
commit3ed277255c06d3bd7950ef688986f2a8f64a9e6a (patch)
treefe87b5f66a904b1c6c9c0659e4f7ba0b8be1d02d /include/package-dumpinfo.mk
parent742d20f881f219f4851607ee3c944ce175b9b7fc (diff)
downloadmaster-187ad058-3ed277255c06d3bd7950ef688986f2a8f64a9e6a.tar.gz
master-187ad058-3ed277255c06d3bd7950ef688986f2a8f64a9e6a.tar.bz2
master-187ad058-3ed277255c06d3bd7950ef688986f2a8f64a9e6a.zip
build: add support for declaring package CONFLICTS which only affect selecting built-in packages
Signed-off-by: Felix Fietkau <nbd@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42770 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/package-dumpinfo.mk')
-rw-r--r--include/package-dumpinfo.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/package-dumpinfo.mk b/include/package-dumpinfo.mk
index 5d1d76fee5..26c8d3199d 100644
--- 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)