projects
/
openwrt
/
staging
/
florian.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4e0a533
)
package-ipkg.mk: fix Provides for packages with multiple PROVIDES entries
author
Matthias Schiffer
<
[email protected]
>
Thu, 16 Jun 2016 02:11:41 +0000
(
04:11
+0200)
committer
Matthias Schiffer
<
[email protected]
>
Thu, 16 Jun 2016 02:15:02 +0000
(
04:15
+0200)
Signed-off-by: Matthias Schiffer <
[email protected]
>
include/package-ipkg.mk
patch
|
blob
|
history
diff --git
a/include/package-ipkg.mk
b/include/package-ipkg.mk
index eb4c874047e8a9e24a4d77b13f7ba66e1221cbb5..1830d644c36fa3dad342d3283529a18b8d70a377 100644
(file)
--- a/
include/package-ipkg.mk
+++ b/
include/package-ipkg.mk
@@
-154,7
+154,7
@@
Package: $(1)
Version: $(VERSION)
$$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
)$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
-)$$(call addfield,Provides,$
(PROVIDES
)
+)$$(call addfield,Provides,$
$(call mergelist,$(PROVIDES)
)
)$$(call addfield,Source,$(SOURCE)
)$$(call addfield,License,$$(PKG_LICENSE)
)$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)