diff options
| author | Robert Marko | 2024-11-18 18:55:57 +0000 |
|---|---|---|
| committer | Robert Marko | 2024-11-19 10:24:07 +0000 |
| commit | dea839773c27430031c2a59c3d37ebdfef3937b9 (patch) | |
| tree | f328930fa1cd8ffdf02ce089397369c3f844e2b1 | |
| parent | b0312c10818f36bc6e61a518bb528d2809562796 (diff) | |
| download | openwrt-dea839773c27430031c2a59c3d37ebdfef3937b9.tar.gz | |
include/package-pack: add default 'provider_priority' for APK packages
Currently, trying to use APK to install a package that has a dependency on
a virtual package that needs to be resolved via 'provides' it will fail if
package does not have 'DEFAULT_VARIANT:=1' like:
apk add usbutils
ERROR: unable to select packages:
libudev (virtual):
note: please select one of the 'provided by' packages explicitly
provided by: libudev-zero
required by: usbutils-017-r1[libudev]
Issue is that we dont set 'provider_priority' that APK uses to break ties
when choosing a virtual package to satisfy a dependency and thus despite
only one package providing the dependency it will still end up with a tie
and just error out.
So, lets simply fix this by providing a default value for
'provider_priority' when 'DEFAULT_VARIANT' is not set and then APK will
be able to resolve dependencies.
Fixes: #16976
Link: https://github.com/openwrt/openwrt/pull/17008
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | include/package-pack.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package-pack.mk b/include/package-pack.mk index 830b39f8d7..e9892f9ca6 100644 --- a/include/package-pack.mk +++ b/include/package-pack.mk @@ -359,7 +359,7 @@ else ) \ ), \ $$(prov) )" \ - $(if $(DEFAULT_VARIANT),--info "provider-priority:100") \ + $(if $(DEFAULT_VARIANT),--info "provider-priority:100",$(if $(PROVIDES),--info "provider-priority:1")) \ --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))" \ |