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 7cea44af656a9294ea34e94dca8bdee003f00dd5..a4901b583f5d5ff88f7a2ce9390e2ed748e7b73b 100644 (file)
--- 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)"; ) \