diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 16:41:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-05 16:41:38 +0000 |
| commit | 78e652f3148ccc80a37f0140711a583ed55310a8 (patch) | |
| tree | 5cbf06bcc2cbc779b2022d247c063437ef92cfef | |
| parent | 3ed277255c06d3bd7950ef688986f2a8f64a9e6a (diff) | |
| download | upstream-78e652f3148ccc80a37f0140711a583ed55310a8.tar.gz upstream-78e652f3148ccc80a37f0140711a583ed55310a8.tar.bz2 upstream-78e652f3148ccc80a37f0140711a583ed55310a8.zip | |
build: propagate package conflicts to opkg metadata
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42771 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-ipkg.mk | 5 |
1 files changed, 5 insertions, 0 deletions
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)"; ) \ |