From 1969218aecdf8dd00a948d4f5d1d87bc854adcbd Mon Sep 17 00:00:00 2001 From: Joel Selvaraj Date: Thu, 17 Mar 2022 13:26:22 +0530 Subject: [PATCH] community/soc-qcom-sdm845: update ucm conf and add q6voiced for call audio support (MR 2982) Also, moving the modemmanager.conf file from the main package to the nonfree-firmware subpackage as Modem Manager is going to work only if the nonfree-firmwares are present. --- device/community/soc-qcom-sdm845/APKBUILD | 15 ++++++++------- .../soc-qcom-sdm845-nonfree-firmware.post-install | 1 + .../soc-qcom-sdm845-nonfree-firmware.post-upgrade | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) create mode 120000 device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-upgrade diff --git a/device/community/soc-qcom-sdm845/APKBUILD b/device/community/soc-qcom-sdm845/APKBUILD index fda03ef68..ddb268018 100644 --- a/device/community/soc-qcom-sdm845/APKBUILD +++ b/device/community/soc-qcom-sdm845/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Caleb Connolly (kalube) pkgname=soc-qcom-sdm845 pkgdesc="Common package for Qualcomm SDM845 devices" -pkgver=5 +pkgver=6 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" @@ -17,7 +17,7 @@ subpackages=" $pkgname-ucm " -_ucm_commit="f959b6c46165f23eebcf34ffefef14c6be015a55" +_ucm_commit="621c71fd5f5742c60d38766ebb2d1bd3b863a2a4" source=" alsa-ucm-conf-$_ucm_commit.tar.gz::https://gitlab.com/sdm845-mainline/alsa-ucm-conf/-/archive/$_ucm_commit/alsa-ucm-conf-$_ucm_commit.tar.gz 90-feedbackd-pmi8998.rules @@ -28,15 +28,16 @@ package() { mkdir -p "$pkgdir" install -Dm644 "$srcdir"/90-feedbackd-pmi8998.rules \ "$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-pmi8998.rules - install -Dm644 "$srcdir"/modemmanager.conf \ - "$pkgdir"/etc/conf.d/modemmanager } nonfree_firmware() { pkgdesc="Modem, WiFi and GPU Firmware" - depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc msm-modem" - install="$subpkgname.post-install" + depends="pd-mapper pd-mapper-openrc tqftpserv tqftpserv-openrc q6voiced q6voiced-openrc msm-modem" + install="$subpkgname.post-install $subpkgname.post-upgrade" mkdir "$subpkgdir" + + install -Dm644 "$srcdir"/modemmanager.conf \ + "$subpkgdir"/etc/conf.d/modemmanager } ucm() { @@ -48,7 +49,7 @@ ucm() { } sha512sums=" -48fba9c041a2a2dfef9f038dfeeb7f636ed4e3b4d1babe2bd9b6ee350a4a34472b0f20d69b57864aa79fb28b24bb38a88ef1542a6d3211db713b361a4d136745 alsa-ucm-conf-f959b6c46165f23eebcf34ffefef14c6be015a55.tar.gz +a1a6c6f5a6156e76e5a15b0078e3baedf07fa02b354cb025b1124ed688434a620d80aa8c0069b2d7ded1a29e2bb9318ab6e8f8a85af33a9dd2478a7b7ec6b494 alsa-ucm-conf-621c71fd5f5742c60d38766ebb2d1bd3b863a2a4.tar.gz 4f2c22a3a3fc7d380e200ad977578107d81f0e7ade7918e03bdb15b60a564e8db5f47e13cce22f636d38fd3722696bb46076b8872dae0ca2d8a3838522a1f025 90-feedbackd-pmi8998.rules e33f41360ccc4900bb76a26cc7b46bde1fb90facdf45c4fbcebc80499386939948401cacd6df9f779eafab10f4ee77ee1fef3e7bd06f483f8c2a4a644c84f327 modemmanager.conf " diff --git a/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install b/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install index 70b9e0efe..36fb71c57 100644 --- a/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install +++ b/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-install @@ -1,3 +1,4 @@ #!/bin/sh rc-update add tqftpserv boot rc-update add pd-mapper boot +rc-update add q6voiced default diff --git a/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-upgrade b/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-upgrade new file mode 120000 index 000000000..f4665b317 --- /dev/null +++ b/device/community/soc-qcom-sdm845/soc-qcom-sdm845-nonfree-firmware.post-upgrade @@ -0,0 +1 @@ +soc-qcom-sdm845-nonfree-firmware.post-install \ No newline at end of file