浏览代码

build: propagate package conflicts to opkg metadata

Signed-off-by: Felix Fietkau <[email protected]>

SVN-Revision: 42771
Felix Fietkau 11 年之前
父节点
当前提交
c6ebce701e
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      include/package-ipkg.mk

+ 5 - 0
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)"; ) \