From 99a29f5dd39a7b777f28202570f2aa94e3a15c98 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Sun, 5 Jul 2026 20:48:31 +0200 Subject: [PATCH] soc-qcom-sm7125: refactor to stop using nonfree-firmware logic Signed-off-by: Aster Boese Part-of: --- device/testing/device-xiaomi-miatoll/APKBUILD | 1 - device/testing/soc-qcom-sm7125/APKBUILD | 25 ++++++++----------- ...ll => soc-qcom-sm7125-openrc.post-install} | 0 3 files changed, 11 insertions(+), 15 deletions(-) rename device/testing/soc-qcom-sm7125/{soc-qcom-sm7125-nonfree-firmware-openrc.post-install => soc-qcom-sm7125-openrc.post-install} (100%) diff --git a/device/testing/device-xiaomi-miatoll/APKBUILD b/device/testing/device-xiaomi-miatoll/APKBUILD index c161079ab..677ad33f8 100644 --- a/device/testing/device-xiaomi-miatoll/APKBUILD +++ b/device/testing/device-xiaomi-miatoll/APKBUILD @@ -50,7 +50,6 @@ nonfree_firmware() { pkgdesc="GPU, venus, modem and sensor firmware" depends=" firmware-xiaomi-miatoll - soc-qcom-sm7125-nonfree-firmware hexagonrpcd>=0.3.2-r3 " diff --git a/device/testing/soc-qcom-sm7125/APKBUILD b/device/testing/soc-qcom-sm7125/APKBUILD index 2cff5dbea..654b1b5f7 100644 --- a/device/testing/soc-qcom-sm7125/APKBUILD +++ b/device/testing/soc-qcom-sm7125/APKBUILD @@ -1,6 +1,6 @@ maintainer="Nikroks " pkgname=soc-qcom-sm7125 -pkgver=4 +pkgver=5 pkgrel=0 pkgdesc="Common package for Qualcomm SM7125 devices" url="https://postmarketos.org" @@ -8,15 +8,16 @@ license="BSD-3-Clause" arch="aarch64" options="!check !archcheck !tracedeps" depends=" - msm-modem-uim-selection bootmac + msm-modem + msm-modem-uim-selection + tqftpserv " subpackages=" - $pkgname-nonfree-firmware:nonfree_firmware - $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc + $pkgname-openrc $pkgname-ucm " - +replaces="soc-qcom-sm7125-nonfree-firmware" _ucm_commit="a34eab049098b78ac5f586b11d93060046da3247" source=" 30-gpu-firmware.files @@ -28,17 +29,13 @@ package() { # Shutdown when battery is critical instead of sleep install -Dm644 "$srcdir"/UPower.conf \ "$pkgdir"/etc/UPower/UPower.conf.d/50-sm7125.conf + + install -Dm644 "$srcdir"/30-gpu-firmware.files \ + "$pkgdir"/usr/share/mkinitfs/files/30-gpu-firmware.files } -nonfree_firmware() { - pkgdesc="Modem, WiFi and GPU Firmware" - depends="msm-modem tqftpserv" - install -Dm644 "$srcdir/30-gpu-firmware.files" \ - "$subpkgdir/usr/share/mkinitfs/files/30-gpu-firmware.files" -} - -nonfree_firmware_openrc() { - install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install" depends=" tqftpserv-openrc diff --git a/device/testing/soc-qcom-sm7125/soc-qcom-sm7125-nonfree-firmware-openrc.post-install b/device/testing/soc-qcom-sm7125/soc-qcom-sm7125-openrc.post-install similarity index 100% rename from device/testing/soc-qcom-sm7125/soc-qcom-sm7125-nonfree-firmware-openrc.post-install rename to device/testing/soc-qcom-sm7125/soc-qcom-sm7125-openrc.post-install