From d94fb692d17d955d01605fee4883fae7cc062ef2 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Sun, 5 Jul 2026 20:45:09 +0200 Subject: [PATCH] soc-qcom-msm8996: refactor to stop using nonfree-firmware logic Signed-off-by: Aster Boese Part-of: --- device/testing/device-xiaomi-natrium/APKBUILD | 3 ++- device/testing/device-xiaomi-scorpio/APKBUILD | 3 ++- device/testing/soc-qcom-msm8996/APKBUILD | 13 ++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/device/testing/device-xiaomi-natrium/APKBUILD b/device/testing/device-xiaomi-natrium/APKBUILD index cbd04aa2a..0d6c11123 100644 --- a/device/testing/device-xiaomi-natrium/APKBUILD +++ b/device/testing/device-xiaomi-natrium/APKBUILD @@ -12,12 +12,13 @@ depends=" firmware-xiaomi-natrium linux-firmware-ath10k linux-firmware-qca + linux-firmware-qcom linux-postmarketos-qcom-msm8996 mesa-egl mkbootimg + msm-modem postmarketos-base soc-qcom-msm8996 - soc-qcom-msm8996-nonfree-firmware soc-qcom-msm8996-ucm " makedepends="devicepkg-dev" diff --git a/device/testing/device-xiaomi-scorpio/APKBUILD b/device/testing/device-xiaomi-scorpio/APKBUILD index 4c3c9cff1..59365af07 100644 --- a/device/testing/device-xiaomi-scorpio/APKBUILD +++ b/device/testing/device-xiaomi-scorpio/APKBUILD @@ -13,14 +13,15 @@ depends=" firmware-xiaomi-scorpio linux-firmware-ath10k linux-firmware-qca + linux-firmware-qcom linux-postmarketos-qcom-msm8996 megapixels mesa-egl mkbootimg + msm-modem postmarketos-base postprocessd soc-qcom-msm8996 - soc-qcom-msm8996-nonfree-firmware soc-qcom-msm8996-ucm " makedepends="devicepkg-dev" diff --git a/device/testing/soc-qcom-msm8996/APKBUILD b/device/testing/soc-qcom-msm8996/APKBUILD index b5cfdc68d..095cf625b 100644 --- a/device/testing/soc-qcom-msm8996/APKBUILD +++ b/device/testing/soc-qcom-msm8996/APKBUILD @@ -1,16 +1,13 @@ maintainer="Yassine Oudjana (Tooniis) " pkgname=soc-qcom-msm8996 pkgdesc="Common package for Qualcomm MSM8996 devices" -pkgver=2 +pkgver=3 pkgrel=0 url="https://postmarketos.org" license="BSD-3-Clause" arch="aarch64" options="!check !archcheck !tracedeps" -subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-ucm - " +subpackages="$pkgname-ucm" _ucm_commit="9f2fd084eccbb01c5bffa6dbc50dcd2b116371d8" source=" @@ -21,12 +18,6 @@ package() { mkdir -p "$pkgdir" } -nonfree_firmware() { - pkgdesc="Non-free firmware for GPU and modem" - depends="linux-firmware-qcom msm-modem" - mkdir "$subpkgdir" -} - ucm() { provides="alsa-ucm-conf" provider_priority=1