soc-qcom-sc7180: refactor to stop using nonfree-firmware logic

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/8958>

device/community/device-google-trogdor/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Alicja Michalska <ellyqw@mainlining.org>"
 pkgname=device-google-trogdor
 pkgdesc="Google Trogdor Chromebooks"
-pkgver=11
+pkgver=12
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -44,7 +44,6 @@ nonfree_firmware() {
 		linux-firmware-qca
 		linux-firmware-ath10k
 		firmware-google-trogdor
-		soc-qcom-sc7180-nonfree-firmware
 		msm-cros-efs-loader
 	"
 	mkdir "$subpkgdir"

device/community/soc-qcom-sc7180/APKBUILD

@@ -3,24 +3,24 @@
 maintainer="Alicja Michalska <ellyqw@mainlining.org>"
 pkgname=soc-qcom-sc7180
 pkgdesc="Common package for Qualcomm Snapdragon 7cx devices"
-pkgver=2
-pkgrel=5
+pkgver=3
+pkgrel=0
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
+depends="rmtfs"
 options="!check !archcheck !tracedeps"
 install="
-	$pkgname-nonfree-firmware-openrc.post-install
-	$pkgname-nonfree-firmware-openrc.post-upgrade
-	$pkgname-nonfree-firmware-woa-openrc.post-install
-	$pkgname-nonfree-firmware-woa-openrc.post-upgrade
+	$pkgname-openrc.post-install
+	$pkgname-openrc.post-upgrade
+	$pkgname-woa-openrc.post-install
+	$pkgname-woa-openrc.post-upgrade
 	"
 subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	$pkgname-nonfree-firmware-woa:nonfree_firmware_woa
-	$pkgname-nonfree-firmware-woa-openrc:nonfree_firmware_woa_openrc
+	$pkgname-openrc
 	$pkgname-vulkan
+	$pkgname-woa-openrc:woa_openrc
+	$pkgname-woa:woa
 "
 source="00-sc7180-nonstrict-iommu.sh"
 
@@ -31,36 +31,29 @@ package() {
 		-t "$pkgdir"/usr/share/mkinitfs/hooks
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi firmware"
-	depends="rmtfs"
-	mkdir "$subpkgdir"
-}
-
-nonfree_firmware_openrc() {
-	depends="openrc rmtfs-openrc"
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+openrc() {
+	depends="rmtfs-openrc"
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware_woa() {
+woa() {
 	pkgdesc="Modem, WiFi firmware"
 	depends="
-		$pkgname-nonfree-firmware
 		pd-mapper
 		tqftpserv
 	"
 	mkdir "$subpkgdir"
 }
 
-nonfree_firmware_woa_openrc() {
+woa_openrc() {
 	depends="
-		openrc
 		pd-mapper-openrc
 		tqftpserv-openrc
 	"
-	install_if="$pkgname-nonfree-firmware-woa=$pkgver-r$pkgrel openrc"
+	install_if="$pkgname-woa=$pkgver-r$pkgrel openrc"
+
 	mkdir "$subpkgdir"
 }
 

device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-openrc.post-upgrade

@@ -1 +0,0 @@
-./soc-qcom-sc7180-nonfree-firmware-openrc.post-install

device/community/soc-qcom-sc7180/soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-upgrade

@@ -1 +0,0 @@
-./soc-qcom-sc7180-nonfree-firmware-woa-openrc.post-install

device/community/soc-qcom-sc7180/soc-qcom-sc7180-openrc.post-upgrade

@@ -0,0 +1 @@
+soc-qcom-sc7180-openrc.post-install

device/community/soc-qcom-sc7180/soc-qcom-sc7180-woa-openrc.post-upgrade

@@ -0,0 +1 @@
+soc-qcom-sc7180-woa-openrc.post-install

device/testing/device-acer-aspire1/APKBUILD

@@ -2,7 +2,7 @@
 maintainer="Nikita Travkin <nikita@trvn.ru>"
 pkgname=device-acer-aspire1
 pkgdesc="Acer Aspire 1"
-pkgver=9
+pkgver=10
 pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
@@ -13,6 +13,7 @@ depends="
 	linux-postmarketos-qcom-sc7180
 	postmarketos-base
 	soc-qcom-sc7180
+	soc-qcom-sc7180-woa
 	systemd-boot
 "
 makedepends="devicepkg-dev"
@@ -64,7 +65,6 @@ nonfree_firmware() {
 		firmware-qcom-adreno-a630
 		linux-firmware-ath10k
 		linux-firmware-qca
-		soc-qcom-sc7180-nonfree-firmware-woa
 	"
 	mkdir "$subpkgdir"
 }