From 6d6d684bfe8f770606b054699c53e38248b0f802 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 6 Jul 2026 14:53:05 +0200 Subject: [PATCH] treewide: move q6voiced.conf to new path Moves configs to the new path as defined by q6voiced version 0.3.0. [ci:skip-grep] Signed-off-by: Aster Boese Part-of: --- device/community/device-google-bonito/APKBUILD | 5 +++-- device/community/device-google-sargo/APKBUILD | 5 +++-- device/community/device-oneplus-enchilada/APKBUILD | 7 ++++--- device/community/device-oneplus-fajita/APKBUILD | 11 +++++------ device/community/device-shift-axolotl/APKBUILD | 4 ++-- device/community/device-xiaomi-beryllium/APKBUILD | 4 ++-- device/community/soc-qcom-msm8953/APKBUILD | 5 +++-- device/testing/device-qualcomm-sdm845/APKBUILD | 5 +++-- device/testing/soc-qcom-msm8916/APKBUILD | 7 ++++--- device/testing/soc-qcom-msm89x7/APKBUILD | 7 ++++--- 10 files changed, 33 insertions(+), 27 deletions(-) diff --git a/device/community/device-google-bonito/APKBUILD b/device/community/device-google-bonito/APKBUILD index 6cac8fdfa..7738a8e91 100644 --- a/device/community/device-google-bonito/APKBUILD +++ b/device/community/device-google-bonito/APKBUILD @@ -2,7 +2,7 @@ maintainer="Anjandev Momi " pkgname=device-google-bonito pkgdesc="Google Pixel 3a XL" -pkgver=10 +pkgver=11 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -59,7 +59,8 @@ package() { # The q6voiced configuration can only be used if the ADSP is brought up # via non-free firmware. - install -Dm644 "$srcdir"/q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$pkgdir"/usr/share/q6voiced/ } kernel_sdc() { diff --git a/device/community/device-google-sargo/APKBUILD b/device/community/device-google-sargo/APKBUILD index 7bd52b9e8..c23ef4dff 100644 --- a/device/community/device-google-sargo/APKBUILD +++ b/device/community/device-google-sargo/APKBUILD @@ -2,7 +2,7 @@ maintainer="Richard Acayan " pkgname=device-google-sargo pkgdesc="Google Pixel 3a" -pkgver=19 +pkgver=20 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -61,7 +61,8 @@ package() { # The q6voiced configuration can only be used if the ADSP is brought up # via non-free firmware. - install -Dm644 "$srcdir"/q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$pkgdir"/usr/share/q6voiced/ install -Dm755 "$srcdir"/reload-rmi-touch.sh \ "$pkgdir"/usr/lib/$pkgname/reload-rmi-touch diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index 0aaf05519..9d85b2bec 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -2,7 +2,7 @@ maintainer="Casey Connolly " pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" -pkgver=28 +pkgver=29 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -50,7 +50,7 @@ package() { devicepkg_package $startdir $pkgname install -Dm644 "$srcdir"/q6voiced.conf \ - "$pkgdir"/etc/conf.d/q6voiced + -t "$pkgdir"/usr/share/q6voiced/ install -Dm644 "$srcdir"/hexagonrpcd.confd \ "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf install -Dm644 -t "$pkgdir"/usr/lib/systemd/system-preset \ @@ -58,8 +58,9 @@ package() { } openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" + default_openrc depends="hexagonrpcd-openrc" + mkdir -p "$subpkgdir" } diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD index f336ac780..dc0b37a88 100644 --- a/device/community/device-oneplus-fajita/APKBUILD +++ b/device/community/device-oneplus-fajita/APKBUILD @@ -3,7 +3,7 @@ maintainer="Casey Connolly " pkgname=device-oneplus-fajita pkgdesc="OnePlus 6T" -pkgver=27 +pkgver=28 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -52,19 +52,18 @@ package() { install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules \ -t "$pkgdir"/usr/lib/udev/rules.d/ - install -Dm644 "$srcdir"/q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$pkgdir"/usr/share/q6voiced/ install -Dm644 "$srcdir"/hexagonrpcd.confd \ "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf install -Dm644 "$srcdir"/80-device-oneplus-fajita.preset \ -t "$pkgdir"/usr/lib/systemd/system-preset } -# Cannot use default_openrc because q6voiced uses the openrc config path, -# even on systemd, and the default_openrc function moves that path to the -# subpackage openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" + default_openrc depends="hexagonrpcd-openrc openrc" + mkdir -p "$subpkgdir" } diff --git a/device/community/device-shift-axolotl/APKBUILD b/device/community/device-shift-axolotl/APKBUILD index 316aaaa05..023a4260a 100644 --- a/device/community/device-shift-axolotl/APKBUILD +++ b/device/community/device-shift-axolotl/APKBUILD @@ -4,7 +4,7 @@ maintainer="Alexander Martinz " pkgname=device-shift-axolotl pkgdesc="SHIFT6mq" -pkgver=24 +pkgver=25 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -50,7 +50,7 @@ package() { install -Dm644 "$srcdir"/81-libssc-shift-axolotl.rules \ -t "$pkgdir"/usr/lib/udev/rules.d/ install -Dm644 "$srcdir"/q6voiced.conf \ - "$pkgdir"/etc/conf.d/q6voiced + -t "$pkgdir"/usr/share/q6voiced/ install -Dm644 "$srcdir"/hexagonrpcd.confd \ "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf } diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD index 4d30777f7..a07d3688f 100644 --- a/device/community/device-xiaomi-beryllium/APKBUILD +++ b/device/community/device-xiaomi-beryllium/APKBUILD @@ -2,7 +2,7 @@ maintainer="Joel Selvaraj " pkgname=device-xiaomi-beryllium pkgdesc="Xiaomi Poco F1" -pkgver=21 +pkgver=22 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -43,7 +43,7 @@ package() { devicepkg_package $startdir $pkgname install -Dm644 "$srcdir"/q6voiced.conf \ - "$pkgdir"/etc/conf.d/q6voiced + -t "$pkgdir"/usr/share/q6voiced/ install -Dm644 "$srcdir"/hexagonrpcd.confd \ "$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf } diff --git a/device/community/soc-qcom-msm8953/APKBUILD b/device/community/soc-qcom-msm8953/APKBUILD index 2bda60252..48364e967 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=19 +pkgver=20 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -50,7 +50,8 @@ modem() { tqftpserv " - install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$subpkgdir"/usr/share/q6voiced/ } modem_openrc() { diff --git a/device/testing/device-qualcomm-sdm845/APKBUILD b/device/testing/device-qualcomm-sdm845/APKBUILD index 5ad1214ac..7811352f7 100644 --- a/device/testing/device-qualcomm-sdm845/APKBUILD +++ b/device/testing/device-qualcomm-sdm845/APKBUILD @@ -3,7 +3,7 @@ maintainer="Casey Connolly " pkgname=device-qualcomm-sdm845 pkgdesc="Generic device package for Qualcomm SDM845 devices" -pkgver=8 +pkgver=9 pkgrel=0 url="https://postmarketos.org" license="MIT" @@ -38,7 +38,8 @@ build() { package() { devicepkg_package $startdir $pkgname - install -Dm644 q6voiced.conf "$pkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$pkgdir"/usr/share/q6voiced/ } sha512sums=" diff --git a/device/testing/soc-qcom-msm8916/APKBUILD b/device/testing/soc-qcom-msm8916/APKBUILD index 8a95622b6..3cdbd715c 100644 --- a/device/testing/soc-qcom-msm8916/APKBUILD +++ b/device/testing/soc-qcom-msm8916/APKBUILD @@ -1,8 +1,8 @@ maintainer="Nikita Travkin " pkgname=soc-qcom-msm8916 pkgdesc="Common package for Qualcomm MSM8916 devices" -pkgver=25 -pkgrel=2 +pkgver=26 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64 armv7" @@ -50,7 +50,8 @@ rproc() { depends="msm-modem msm-modem-uim-selection q6voiced" replaces="$pkgname-modem $pkgname-rproc_none $pkgname-rproc_no_modem $pkgname-rproc_all" - install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$subpkgdir"/usr/share/q6voiced/ } rproc_openrc() { diff --git a/device/testing/soc-qcom-msm89x7/APKBUILD b/device/testing/soc-qcom-msm89x7/APKBUILD index bfa657cf9..a5736622a 100644 --- a/device/testing/soc-qcom-msm89x7/APKBUILD +++ b/device/testing/soc-qcom-msm89x7/APKBUILD @@ -1,8 +1,8 @@ maintainer="Barnabas Czeman " pkgname=soc-qcom-msm89x7 pkgdesc="Common package for Qualcomm MSM89x7 devices" -pkgver=5 -pkgrel=1 +pkgver=6 +pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" @@ -61,7 +61,8 @@ modem() { tqftpserv " - install -Dm644 "$srcdir"/q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/q6voiced.conf \ + -t "$subpkgdir"/usr/share/q6voiced/ } modem_openrc() {