From dee2c0a1a00f5741e75950d94b7c3ba2308a418c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Wed, 19 Aug 2026 10:41:54 +0200 Subject: [PATCH] device/*: make forked alsa-ucm-conf packages provide a versioned alsa-ucm-conf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-versioned provides with a provider priority as used before this commit are only useful for virtual packages. That is, packages which can be installed concurrently to each other. Therefore, having non-version provider signals that the forked package is intended to be allowed to be installed alongside the main package. Not only this is not the case (we don't wanted forked alsa-ucm-conf and the upstream one installed together), but in addition, doing so is impossible. That is because the main alsa-ucm-conf package provides by default a versioned provider of itself, making the concurrent installation not allowed. Therefore, using non-versioned provides, although harmless in practice, represents a packaging bug that makes understaning and reasoning about the fork harder. Instead of doing that, make the providers versioned, and remove the provider_priority. Now, it is clear that the forked alsa-ucm-conf packages must replace the upstream one. To avoid installations that do not need a forked alsa-ucm-conf, we must make sure that the version which the forked packages provide is lower than the version of the upstream package. We do so by prepending a 0. to the version, and adding an explanatory comment. Signed-off-by: Pablo Correa Gómez Part-of: --- device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD | 5 ++--- device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD | 5 ++--- device/community/alsa-ucm-conf-sdm845/APKBUILD | 7 +++---- device/community/soc-qcom-msm8953/APKBUILD | 5 ++--- device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD | 5 ++--- device/testing/alsa-ucm-conf-qcom-sc7280/APKBUILD | 5 ++--- device/testing/alsa-ucm-conf-qcom-sdm660/APKBUILD | 5 ++--- device/testing/alsa-ucm-conf-unisoc-ums9230/APKBUILD | 5 ++--- device/testing/soc-qcom-msm8916/APKBUILD | 5 ++--- device/testing/soc-qcom-msm8996/APKBUILD | 5 ++--- device/testing/soc-qcom-msm89x7/APKBUILD | 5 ++--- device/testing/soc-qcom-sm7125/APKBUILD | 5 ++--- 12 files changed, 25 insertions(+), 37 deletions(-) diff --git a/device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD b/device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD index 4d1c7fded..be6c9563f 100644 --- a/device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD +++ b/device/community/alsa-ucm-conf-qcom-sdm670/APKBUILD @@ -1,13 +1,12 @@ maintainer="Richard Acayan " pkgname=alsa-ucm-conf-qcom-sdm670 pkgver=1.2.9_git20260610 -pkgrel=0 +pkgrel=1 pkgdesc="ALSA UCM configuration for SDM670 devices" url="https://gitlab.com/sdm670-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.${pkgver%_*}-r$pkgrel" # versioned provides need to be below default version _commit="1e39c9fce12cb521bb53a6422532822b2e4faa10" source="https://gitlab.com/sdm670-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz" options="!check" diff --git a/device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD b/device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD index e2176ffdf..24318ee0b 100644 --- a/device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD +++ b/device/community/alsa-ucm-conf-qcom-sm7150/APKBUILD @@ -3,13 +3,12 @@ maintainer="Danila Tikhonov " pkgname=alsa-ucm-conf-qcom-sm7150 pkgver=1.2.15.3_git20260513 -pkgrel=0 +pkgrel=1 pkgdesc="ALSA UCM configuration for SM7150 devices" url="https://github.com/sm7150-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.${pkgver%_*}-r$pkgrel" # versioned provides need to be below default version _commit="4821070589906c1d80c83210639591678c245369" source="$pkgname-$_commit.tar.gz::https://github.com/sm7150-mainline/alsa-ucm-conf/archive/$_commit.tar.gz" options="!check" diff --git a/device/community/alsa-ucm-conf-sdm845/APKBUILD b/device/community/alsa-ucm-conf-sdm845/APKBUILD index e4b841376..7cf292522 100644 --- a/device/community/alsa-ucm-conf-sdm845/APKBUILD +++ b/device/community/alsa-ucm-conf-sdm845/APKBUILD @@ -1,14 +1,13 @@ # Co-Maintainer: Joel Selvaraj maintainer="Casey Connolly " pkgname=alsa-ucm-conf-sdm845 -pkgver=2 -pkgrel=1 +pkgver=3 +pkgrel=0 pkgdesc="ALSA UCM configuration for Qualcomm SDM845 devices" url="https://gitlab.com/sdm845-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version replaces="soc-qcom-sdm845-ucm" _commit="1b8d290e5aa2ca16b7f2fa8d74910ad19ef88b3a" source="$pkgname-$_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_commit/alsa-ucm-conf-$_commit.tar.gz" diff --git a/device/community/soc-qcom-msm8953/APKBUILD b/device/community/soc-qcom-msm8953/APKBUILD index 48364e967..425f7a3e9 100644 --- a/device/community/soc-qcom-msm8953/APKBUILD +++ b/device/community/soc-qcom-msm8953/APKBUILD @@ -2,7 +2,7 @@ maintainer="Barnabas Czeman " pkgname=soc-qcom-msm8953 pkgdesc="Common package for Qualcomm MSM8953 devices" -pkgver=20 +pkgver=21 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -33,8 +33,7 @@ package() { } ucm() { - provides="alsa-ucm-conf" - provider_priority=1 + provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version cd "$srcdir/alsa-ucm-conf-$_ucm_commit" mkdir -p "$subpkgdir"/usr/share/alsa diff --git a/device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD b/device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD index d22e80af5..0edac0caa 100644 --- a/device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD +++ b/device/testing/alsa-ucm-conf-ayaneo-pocket-s2/APKBUILD @@ -1,13 +1,12 @@ maintainer="Neil Armstrong " pkgname=alsa-ucm-conf-ayaneo-pocket-s2 pkgver=1.2.16_git20260612 -pkgrel=0 +pkgrel=1 pkgdesc="ALSA UCM configuration for Ayaneo Pocket S2" url="https://github.com/superna9999/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.${pkgver%_*}-r$pkgrel" # versioned provides need to be below default version _commit="5e1cfc6810013182570d6ac8386a58d2fde83b0c" source=" $pkgname-$_commit.tar.gz::https://github.com/superna9999/alsa-ucm-conf/archive/$_commit.tar.gz diff --git a/device/testing/alsa-ucm-conf-qcom-sc7280/APKBUILD b/device/testing/alsa-ucm-conf-qcom-sc7280/APKBUILD index 6b5d425b0..527f10199 100644 --- a/device/testing/alsa-ucm-conf-qcom-sc7280/APKBUILD +++ b/device/testing/alsa-ucm-conf-qcom-sc7280/APKBUILD @@ -1,13 +1,12 @@ maintainer="Luca Weiss " pkgname=alsa-ucm-conf-qcom-sc7280 -pkgver=4 +pkgver=5 pkgrel=0 pkgdesc="ALSA UCM configuration for sc7280 devices" url="https://github.com/sc7280-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version _commit="f051a09ade09b918c63e1fcf06663a022470b24a" source="$pkgname-$_commit.tar.gz::$url/archive/$_commit.tar.gz" options="!check" diff --git a/device/testing/alsa-ucm-conf-qcom-sdm660/APKBUILD b/device/testing/alsa-ucm-conf-qcom-sdm660/APKBUILD index 813aff672..defffd701 100644 --- a/device/testing/alsa-ucm-conf-qcom-sdm660/APKBUILD +++ b/device/testing/alsa-ucm-conf-qcom-sdm660/APKBUILD @@ -1,14 +1,13 @@ maintainer="Nickolay Goppen " pkgname=alsa-ucm-conf-qcom-sdm660 pkgver=1.2.15_git20260721 -pkgrel=0 +pkgrel=1 _commit="8cfa1a20c94eede091596a293163fa5f9b4e3c12" pkgdesc="ALSA UCM configuration for SDM660 devices" url="https://github.com/sdm660-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.${pkgver%_*}-r$pkgrel" # versioned provides need to be below default version source="$pkgname-$_commit.tar.gz::https://github.com/sdm660-mainline/alsa-ucm-conf/archive/$_commit.tar.gz" options="!check" diff --git a/device/testing/alsa-ucm-conf-unisoc-ums9230/APKBUILD b/device/testing/alsa-ucm-conf-unisoc-ums9230/APKBUILD index 17a3deb50..a6f2ec390 100644 --- a/device/testing/alsa-ucm-conf-unisoc-ums9230/APKBUILD +++ b/device/testing/alsa-ucm-conf-unisoc-ums9230/APKBUILD @@ -1,13 +1,12 @@ maintainer="Affe Null " pkgname=alsa-ucm-conf-unisoc-ums9230 pkgver=1.2.9_git20251211 -pkgrel=0 +pkgrel=1 pkgdesc="ALSA UCM configuration for UMS9230 devices" url="https://codeberg.org/ums9230-mainline/alsa-ucm-conf" arch="aarch64" license="BSD-3-Clause" -provides="alsa-ucm-conf" -provider_priority=1 +provides="alsa-ucm-conf=0.${pkgver%_*}-r$pkgrel" # versioned provides need to be below default version _tag="ums9230-20251211" source="alsa-ucm-conf-$_tag.tar.gz::$url/archive/$_tag.tar.gz" options="!check" diff --git a/device/testing/soc-qcom-msm8916/APKBUILD b/device/testing/soc-qcom-msm8916/APKBUILD index 3cdbd715c..15a9e4bae 100644 --- a/device/testing/soc-qcom-msm8916/APKBUILD +++ b/device/testing/soc-qcom-msm8916/APKBUILD @@ -1,7 +1,7 @@ maintainer="Nikita Travkin " pkgname=soc-qcom-msm8916 pkgdesc="Common package for Qualcomm MSM8916 devices" -pkgver=26 +pkgver=27 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -36,8 +36,7 @@ package() { # version for now. Once all the UCM refactoring upstream has settled down a bit # we can investigate how to integrate it properly for upstreaming. ucm() { - provides="alsa-ucm-conf" - provider_priority=1 + provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version cd "$srcdir/alsa-ucm-conf-$_ucm_commit" mkdir -p "$subpkgdir"/usr/share/alsa diff --git a/device/testing/soc-qcom-msm8996/APKBUILD b/device/testing/soc-qcom-msm8996/APKBUILD index 095cf625b..c5e27fd1d 100644 --- a/device/testing/soc-qcom-msm8996/APKBUILD +++ b/device/testing/soc-qcom-msm8996/APKBUILD @@ -1,7 +1,7 @@ maintainer="Yassine Oudjana (Tooniis) " pkgname=soc-qcom-msm8996 pkgdesc="Common package for Qualcomm MSM8996 devices" -pkgver=3 +pkgver=4 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -19,8 +19,7 @@ package() { } ucm() { - provides="alsa-ucm-conf" - provider_priority=1 + provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version # install audio config files mkdir -p "$subpkgdir"/usr/share/alsa/ucm2 diff --git a/device/testing/soc-qcom-msm89x7/APKBUILD b/device/testing/soc-qcom-msm89x7/APKBUILD index a5736622a..b46077408 100644 --- a/device/testing/soc-qcom-msm89x7/APKBUILD +++ b/device/testing/soc-qcom-msm89x7/APKBUILD @@ -1,7 +1,7 @@ maintainer="Barnabas Czeman " pkgname=soc-qcom-msm89x7 pkgdesc="Common package for Qualcomm MSM89x7 devices" -pkgver=6 +pkgver=7 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -35,8 +35,7 @@ package() { } ucm() { - provides="alsa-ucm-conf" - provider_priority=1 + provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version cd "$srcdir/alsa-ucm-conf-$_ucm_commit" mkdir -p "$subpkgdir"/usr/share/alsa diff --git a/device/testing/soc-qcom-sm7125/APKBUILD b/device/testing/soc-qcom-sm7125/APKBUILD index 71528c987..c9350104f 100644 --- a/device/testing/soc-qcom-sm7125/APKBUILD +++ b/device/testing/soc-qcom-sm7125/APKBUILD @@ -1,7 +1,7 @@ # Co-Maintainer: Stefan Hansson maintainer="Erikas Bitovtas " pkgname=soc-qcom-sm7125 -pkgver=6 +pkgver=7 pkgrel=0 pkgdesc="Common package for Qualcomm SM7125 devices" url="https://postmarketos.org" @@ -44,8 +44,7 @@ openrc() { } ucm() { - provides="alsa-ucm-conf" - provider_priority=1 + provides="alsa-ucm-conf=0.$pkgver-r$pkgrel" # versioned provides need to be below default version # install audio config files mkdir -p "$subpkgdir"/usr/share/alsa/ucm2