From 5e4789671ae4ecd9d2eb239e865f15ef60232287 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 5 Oct 2014 16:41:33 +0000
Subject: 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
---
 include/package-dumpinfo.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/package-dumpinfo.mk')

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)
-- 
cgit v1.2.3