summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren2024-10-30 08:28:30 +0000
committerChristian Marangi2024-10-30 13:17:33 +0000
commit559df6cb99c38be124ebe1b2211aaf368451a8b3 (patch)
treeee23c06c9c29395bd587ccafd7fa26fff010ba32
parent07b845b1f2e7417c39f3585d971b05f7ab3ce08b (diff)
downloadopenwrt-559df6cb99c38be124ebe1b2211aaf368451a8b3.tar.gz
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@aparcar.org>
-rw-r--r--include/package-pack.mk1
1 files changed, 1 insertions, 0 deletions
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))" \