From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 5 Oct 2014 16:41:38 +0000 (+0000)
Subject: build: propagate package conflicts to opkg metadata
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c6ebce701ee60aa194e1736e63c081baa3fd1644;p=openwrt%2Fstaging%2Fyousong.git

build: propagate package conflicts to opkg metadata

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 42771
---

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index 7cea44af65..a4901b583f 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -160,6 +160,11 @@ ifeq ($(DUMP),)
 			DEPENDS=$$$${DEPENDS:+$$$$DEPENDS, }$$$${depend##+}; \
 		done; \
 		[ -z "$$$$DEPENDS" ] || echo "Depends: $$$$DEPENDS"; \
+		CONFLICTS=''; \
+		for conflict in $(CONFLICTS); do \
+			CONFLICTS=$$$${CONFLICTS:+$$$$CONFLICTS, }$$$$conflict; \
+		done; \
+		[ -z "$$$$CONFLICTS" ] || echo "Conflicts: $$$$CONFLICTS"; \
 		$(if $(PROVIDES), echo "Provides: $(PROVIDES)"; ) \
 		echo "Source: $(SOURCE)"; \
 		$(if $(PKG_LICENSE), echo "License: $(PKG_LICENSE)"; ) \