Pārlūkot izejas kodu

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 <[email protected]>
Paul Spooren 1 gadu atpakaļ
vecāks
revīzija
559df6cb99
1 mainītis faili ar 1 papildinājumiem un 0 dzēšanām
  1. 1 0
      include/package-pack.mk

+ 1 - 0
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))" \