forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

soc-qcom-sdm845: encapsulate cellular specific stuff (MR 4047)

Browse source 
The upcoming db845c doesn't have cellular modem capabilities, but still
has wifi. Avoid installing modem related configs and services by default
and only install it for devices that need it.
This commit is contained in:
Caleb Connolly 2023-04-29 23:09:49 +01:00
parent 01d084c777
commit 6c27c1c460
No known key found for this signature in database
GPG key ID: 0583312B195F64B6
11 changed files with 49 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
device/community/device-oneplus-enchilada/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=device-oneplus-enchilada pkgname=device-oneplus-enchilada
pkgdesc="OnePlus 6" pkgdesc="OnePlus 6"
pkgver=9 pkgver=9
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -36,7 +36,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl" pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware" depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
mkdir "$subpkgdir" mkdir "$subpkgdir"
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

5
device/community/device-oneplus-fajita/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=device-oneplus-fajita pkgname=device-oneplus-fajita
pkgdesc="OnePlus 6T" pkgdesc="OnePlus 6T"
pkgver=9 pkgver=9
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -36,7 +36,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl" pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware" depends="firmware-oneplus-sdm845 firmware-oneplus-sdm845-initramfs
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
mkdir "$subpkgdir" mkdir "$subpkgdir"
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

5
device/community/device-shift-axolotl/APKBUILD
View file

@ -5,7 +5,7 @@
pkgname=device-shift-axolotl pkgname=device-shift-axolotl
pkgdesc="SHIFT6mq" pkgdesc="SHIFT6mq"
pkgver=8 pkgver=8
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -42,7 +42,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl" pkgdesc="Modem, GPU and WiFi Firmware, also needed for osk-sdl"
depends="firmware-shift-sdm845 firmware-shift-sdm845-initramfs soc-qcom-sdm845-nonfree-firmware" depends="firmware-shift-sdm845 firmware-shift-sdm845-initramfs
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
mkdir "$subpkgdir" mkdir "$subpkgdir"
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

5
device/community/device-xiaomi-beryllium/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=device-xiaomi-beryllium pkgname=device-xiaomi-beryllium
pkgdesc="Xiaomi Poco F1" pkgdesc="Xiaomi Poco F1"
pkgver=8 pkgver=8
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -40,7 +40,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="GPU, venus, modem firmware" pkgdesc="GPU, venus, modem firmware"
depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware" depends="firmware-xiaomi-beryllium soc-qcom-sdm845-nonfree-firmware
soc-qcom-sdm845-modem"
mkdir "$subpkgdir" mkdir "$subpkgdir"
install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced

39
device/community/soc-qcom-sdm845/APKBUILD
View file

@ -3,7 +3,7 @@
pkgname=soc-qcom-sdm845 pkgname=soc-qcom-sdm845
pkgdesc="Common package for Qualcomm SDM845 devices" pkgdesc="Common package for Qualcomm SDM845 devices"
pkgver=14 pkgver=14
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="BSD-3-Clause" license="BSD-3-Clause"
arch="aarch64" arch="aarch64"
@ -13,6 +13,7 @@ depends="
" "
replaces="upower" replaces="upower"
subpackages=" subpackages="
$pkgname-modem
$pkgname-nonfree-firmware:nonfree_firmware $pkgname-nonfree-firmware:nonfree_firmware
$pkgname-qbootctl $pkgname-qbootctl
$pkgname-ucm $pkgname-ucm
@ -40,20 +41,14 @@ package() {
"$pkgdir"/etc/UPower/UPower.conf "$pkgdir"/etc/UPower/UPower.conf
} }
nonfree_firmware() { modem() {
pkgdesc="Modem, WiFi and GPU Firmware" pkgdesc="Modem services and configuration"
depends=" depends="
pd-mapper q6voiced
pd-mapper-openrc q6voiced-openrc
tqftpserv msm-modem-uim-selection
tqftpserv-openrc "
q6voiced
q6voiced-openrc
msm-modem
msm-modem-uim-selection
bootmac
alsa-utils
"
install="$subpkgname.post-install $subpkgname.post-upgrade" install="$subpkgname.post-install $subpkgname.post-upgrade"
mkdir "$subpkgdir" mkdir "$subpkgdir"
@ -72,6 +67,22 @@ nonfree_firmware() {
"$subpkgdir"/etc/conf.d/call_audio_idle_suspend_workaround "$subpkgdir"/etc/conf.d/call_audio_idle_suspend_workaround
} }
nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware"
depends="
pd-mapper
pd-mapper-openrc
tqftpserv
tqftpserv-openrc
msm-modem
bootmac
alsa-utils
"
install="$subpkgname.post-install $subpkgname.post-upgrade"
mkdir "$subpkgdir"
}
ucm() { ucm() {
provides="alsa-ucm-conf" provides="alsa-ucm-conf"
provider_priority=1 provider_priority=1

3
device/community/soc-qcom-sdm845/soc-qcom-sdm845-modem.post-install Normal file
View file

@ -0,0 +1,3 @@
#!/bin/sh
rc-update add q6voiced default
rc-update add call_audio_idle_suspend_workaround default

1
device/community/soc-qcom-sdm845/soc-qcom-sdm845-modem.post-upgrade Symbolic link
View file

@ -0,0 +1 @@
soc-qcom-sdm845-modem.post-install

2
device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install
View file

@ -1,5 +1,3 @@
#!/bin/sh #!/bin/sh
rc-update add tqftpserv boot rc-update add tqftpserv boot
rc-update add pd-mapper boot rc-update add pd-mapper boot
rc-update add q6voiced default
rc-update add call_audio_idle_suspend_workaround default

5
device/testing/device-google-sargo/APKBUILD
View file

@ -3,7 +3,7 @@
pkgname=device-google-sargo pkgname=device-google-sargo
pkgdesc="Google Pixel 3a" pkgdesc="Google Pixel 3a"
pkgver=0.4 pkgver=0.4
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -31,7 +31,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Proprietary firmware blobs for the Google Pixel 3a" pkgdesc="Proprietary firmware blobs for the Google Pixel 3a"
depends="firmware-google-sargo linux-firmware-qca linux-firmware-qcom msm-firmware-loader soc-qcom-sdm845-nonfree-firmware" depends="firmware-google-sargo linux-firmware-qca linux-firmware-qcom
msm-firmware-loader soc-qcom-sdm845-modem soc-qcom-sdm845-nonfree-firmware"
# Create an empty sub-package directory because this sub-package is empty # Create an empty sub-package directory because this sub-package is empty
mkdir "$subpkgdir" mkdir "$subpkgdir"

5
device/testing/device-xiaomi-polaris/APKBUILD
View file

@ -4,7 +4,7 @@
pkgname=device-xiaomi-polaris pkgname=device-xiaomi-polaris
pkgdesc="Xiaomi Mi Mix 2S" pkgdesc="Xiaomi Mi Mix 2S"
pkgver=0.1 pkgver=0.1
pkgrel=1 pkgrel=2
url="https://postmarketos.org" url="https://postmarketos.org"
license="MIT" license="MIT"
arch="aarch64" arch="aarch64"
@ -37,7 +37,8 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl" pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
depends="firmware-xiaomi-polaris firmware-xiaomi-polaris-initramfs soc-qcom-sdm845-nonfree-firmware" depends="firmware-xiaomi-polaris firmware-xiaomi-polaris-initramfs
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-modem"
mkdir "$subpkgdir" mkdir "$subpkgdir"
} }

3
device/testing/soc-qcom-msm8998/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=soc-qcom-msm8998 pkgname=soc-qcom-msm8998
pkgdesc="Common package for Qualcomm MSM8998 devices" pkgdesc="Common package for Qualcomm MSM8998 devices"
pkgver=1 pkgver=1
pkgrel=0 pkgrel=1
url="https://postmarketos.org" url="https://postmarketos.org"
license="BSD-3-Clause" license="BSD-3-Clause"
arch="aarch64" arch="aarch64"
@ -18,6 +18,7 @@ package() {
nonfree_firmware() { nonfree_firmware() {
pkgdesc="Modem, WiFi and GPU Firmware" pkgdesc="Modem, WiFi and GPU Firmware"
depends=" depends="
soc-qcom-sdm845-modem
soc-qcom-sdm845-nonfree-firmware soc-qcom-sdm845-nonfree-firmware
qcom-diag qcom-diag
qcom-diag-openrc qcom-diag-openrc