0051-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch 857 B

123456789101112131415161718192021
  1. From: Matthias Schiffer <mschiffer@universe-factory.net>
  2. Date: Thu, 16 Jun 2016 04:28:44 +0200
  3. Subject: package-ipkg.mk: fix Provides for packages with multiple PROVIDES entries
  4. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
  5. Backport of LEDE 3ee6c17cd14ec1fed0b0491542c499c03fc6d211
  6. diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
  7. index eb4c874..1830d64 100644
  8. --- a/include/package-ipkg.mk
  9. +++ b/include/package-ipkg.mk
  10. @@ -154,7 +154,7 @@ Package: $(1)
  11. Version: $(VERSION)
  12. $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
  13. )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
  14. -)$$(call addfield,Provides,$(PROVIDES)
  15. +)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
  16. )$$(call addfield,Source,$(SOURCE)
  17. )$$(call addfield,License,$$(PKG_LICENSE)
  18. )$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)