build: propagate package conflicts to opkg metadata
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Oct 2014 16:41:38 +0000 (16:41 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 5 Oct 2014 16:41:38 +0000 (16:41 +0000)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42771 3c298f89-4303-0410-b956-a3cf2f4a3e73

include/package-ipkg.mk

index 7cea44a..a4901b5 100644 (file)
@@ -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)"; ) \