From: Paul Spooren Date: Wed, 30 Oct 2024 08:28:30 +0000 (+0100) Subject: build: Honor DEFAULT_VARIANT for APK packages X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=559df6cb99c38be124ebe1b2211aaf368451a8b3;p=openwrt%2Fstaging%2Fnbd.git 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 --- 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))" \