[openwrt/openwrt] build: Honor DEFAULT_VARIANT for APK packages
LEDE Commits
lede-commits at lists.infradead.org
Wed Oct 30 06:17:54 PDT 2024
ansuel pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/559df6cb99c38be124ebe1b2211aaf368451a8b3
commit 559df6cb99c38be124ebe1b2211aaf368451a8b3
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Wed Oct 30 09:28:30 2024 +0100
build: Honor DEFAULT_VARIANT for APK packages
Previously APK would complain as it wasn't sure which package to
install by default when multiple packages would provide the same name.
Now, give the package a higher provider priority to make APK
automatically select the "default" package.
Signed-off-by: Paul Spooren <mail at aparcar.org>
---
include/package-pack.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/package-pack.mk b/include/package-pack.mk
index a677318ca2..9d06c8b647 100644
--- a/include/package-pack.mk
+++ b/include/package-pack.mk
@@ -355,6 +355,7 @@ else
) \
), \
$$(prov) )" \
+ $(if $(DEFAULT_VARIANT),--info "provider-priority:100") \
--script "post-install:$$(ADIR_$(1))/post-install" \
--script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall" \
--info "depends:$$(foreach depends,$$(subst $$(comma),$$(space),$$(subst $$(space),,$$(subst $$(paren_right),,$$(subst $$(paren_left),,$$(Package/$(1)/DEPENDS))))),$$(depends))" \
More information about the lede-commits
mailing list