From 7a29af043c958f2667e50eadf91896f472496fc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= Date: Tue, 23 Sep 2025 23:09:23 +0200 Subject: [PATCH] soc-qcom-msm8916: drop non-functional rproc selection lk2nd does no longer support mode selection based on /boot/lk2nd_rproc_mode. Part-of: --- device/community/soc-qcom-msm8916/APKBUILD | 40 +++++-------------- ...oc-qcom-msm8916-rproc-openrc.post-install} | 0 device/testing/soc-qcom-msm8909/APKBUILD | 4 +- 3 files changed, 11 insertions(+), 33 deletions(-) rename device/community/soc-qcom-msm8916/{soc-qcom-msm8916-rproc-all-openrc.post-install => soc-qcom-msm8916-rproc-openrc.post-install} (100%) diff --git a/device/community/soc-qcom-msm8916/APKBUILD b/device/community/soc-qcom-msm8916/APKBUILD index 38093c956..b962e3148 100644 --- a/device/community/soc-qcom-msm8916/APKBUILD +++ b/device/community/soc-qcom-msm8916/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Nikita Travkin pkgname=soc-qcom-msm8916 pkgdesc="Common package for Qualcomm MSM8916 devices" -pkgver=24 +pkgver=25 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -12,10 +12,8 @@ depends="$pkgname-ucm swclock-offset" subpackages=" $pkgname-gpu $pkgname-ucm - $pkgname-rproc-none:rproc_none - $pkgname-rproc-no-modem:rproc_no_modem - $pkgname-rproc-all:rproc_all - $pkgname-rproc-all-openrc:rproc_all_openrc + $pkgname-rproc + $pkgname-rproc-openrc:rproc_openrc soc-samsung-msm8916-modem-workaround:samsung_modem_workaround " @@ -47,39 +45,19 @@ ucm() { cp -r ucm2 "$subpkgdir"/usr/share/alsa } -rproc_none() { - pkgdesc="Disable all remote processors (no WiFi/BT/modem, ~90 MiB more RAM)" - provides="soc-qcom-msm8916-rproc=$pkgver-r$pkgrel" - - mkdir -p "$subpkgdir"/boot - echo none > "$subpkgdir"/boot/lk2nd_rproc_mode -} - -rproc_no_modem() { - pkgdesc="Disable only modem (audio bypasses modem, ~80 MiB more RAM)" - provides="soc-qcom-msm8916-rproc=$pkgver-r$pkgrel" - provider_priority=50 - - mkdir -p "$subpkgdir"/boot - echo no-modem > "$subpkgdir"/boot/lk2nd_rproc_mode -} - -rproc_all() { - pkgdesc="Enable all remote processors (audio goes through modem)" - provides="soc-qcom-msm8916-rproc=$pkgver-r$pkgrel" - provider_priority=100 +rproc() { + pkgdesc="Enable all remote processors (WiFi/BT/modem)" depends="msm-modem msm-modem-uim-selection q6voiced" - replaces="soc-qcom-msm8916-modem" + replaces="$pkgname-modem $pkgname-rproc_none $pkgname-rproc_no_modem $pkgname-rproc_all" - mkdir -p "$subpkgdir"/boot - echo all > "$subpkgdir"/boot/lk2nd_rproc_mode install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced } -rproc_all_openrc() { - install_if="$pkgname-rproc-all=$pkgver-r$pkgrel openrc" +rproc_openrc() { + install_if="$pkgname-rproc=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" + replaces="$pkgname-rproc_all_openrc" mkdir -p "$subpkgdir" } diff --git a/device/community/soc-qcom-msm8916/soc-qcom-msm8916-rproc-all-openrc.post-install b/device/community/soc-qcom-msm8916/soc-qcom-msm8916-rproc-openrc.post-install similarity index 100% rename from device/community/soc-qcom-msm8916/soc-qcom-msm8916-rproc-all-openrc.post-install rename to device/community/soc-qcom-msm8916/soc-qcom-msm8916-rproc-openrc.post-install diff --git a/device/testing/soc-qcom-msm8909/APKBUILD b/device/testing/soc-qcom-msm8909/APKBUILD index 37c424074..1c04923e2 100644 --- a/device/testing/soc-qcom-msm8909/APKBUILD +++ b/device/testing/soc-qcom-msm8909/APKBUILD @@ -1,7 +1,7 @@ pkgname=soc-qcom-msm8909 pkgdesc="Common package for Qualcomm MSM8909 devices" pkgver=1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="GPL-3.0-or-later" arch="armv7 aarch64" @@ -22,7 +22,7 @@ package() { modem() { pkgdesc="Modem support for Qualcomm MSM8909 devices" - install_if="soc-qcom-msm8909 soc-qcom-msm8916-rproc-all" + install_if="soc-qcom-msm8909 soc-qcom-msm8916-rproc" depends="qmi-utils" mkdir -p "$subpkgdir" }