From 86fa84091536999e5ec4170c9a5c0f8afd0dcb48 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Fri, 28 Jun 2024 15:09:08 +0200
Subject: [PATCH] device-fairphone-fp4: drop nonfree firmware subpackage (MR
 5290)

The device already loads plenty of nonfree-firmware into the
co-processors during the bootloader stages, and also once booted in
Linux won't really be useful without everything.

Additionally I doubt anyone tests that case, so just require nonfree
firmware unconditionally to simplify maintenance.
---
 .../community/device-fairphone-fp4/APKBUILD   | 39 +++++++------------
 ...airphone-fp4-nonfree-firmware.post-install |  3 --
 .../device-fairphone-fp4.post-install         |  2 +
 3 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install

diff --git a/device/community/device-fairphone-fp4/APKBUILD b/device/community/device-fairphone-fp4/APKBUILD
index bf86f599c..1bd39bddb 100644
--- a/device/community/device-fairphone-fp4/APKBUILD
+++ b/device/community/device-fairphone-fp4/APKBUILD
@@ -10,14 +10,29 @@ arch="aarch64"
 options="!check !archcheck"
 depends="
 	bootmac
+	firmware-fairphone-fp4-adreno
+	firmware-fairphone-fp4-adsp
+	firmware-fairphone-fp4-bluetooth
+	firmware-fairphone-fp4-cdsp
+	firmware-fairphone-fp4-ipa
+	firmware-fairphone-fp4-modem
+	firmware-fairphone-fp4-wlan
+	firmware-qcom-adreno-a630
+	linux-firmware-ath10k
 	linux-postmarketos-qcom-sm6350
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
 	mkbootimg
+	msm-modem
+	msm-modem-uim-selection
+	pd-mapper
+	pd-mapper-openrc
 	postmarketos-base
 	qbootctl
 	qbootctl-openrc
 	swclock-offset
+	tqftpserv
+	tqftpserv-openrc
 "
 makedepends="devicepkg-dev"
 install="$pkgname.post-install $pkgname.post-upgrade"
@@ -26,9 +41,6 @@ source="
 	deviceinfo
 	modules-initfs
 	"
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -41,27 +53,6 @@ package() {
 		"$pkgdir"/usr/lib/udev/rules.d/90-feedbackd-aw8695.rules
 }
 
-nonfree_firmware() {
-	pkgdesc="Firmware for Modem, WiFi, etc."
-	depends="
-		firmware-fairphone-fp4-adreno
-		firmware-fairphone-fp4-adsp
-		firmware-fairphone-fp4-bluetooth
-		firmware-fairphone-fp4-cdsp
-		firmware-fairphone-fp4-ipa
-		firmware-fairphone-fp4-modem
-		firmware-fairphone-fp4-wlan
-		firmware-qcom-adreno-a630
-		linux-firmware-ath10k
-		msm-modem
-		msm-modem-uim-selection
-		pd-mapper
-		tqftpserv
-		"
-	install="$subpkgname.post-install"
-	mkdir "$subpkgdir"
-}
-
 sha512sums="
 2974ccc172bf1299daeb0bc746879b3a1db1fbc3a2b163a02a6554fed6ed9f733144bcf976cd2441c5664d496dcce3ae943f4314c653470dc07dda0de5ad632b  90-feedbackd-aw8695.rules
 9549f105f865d230e7b67819c96b7e06a5ed4d5808f083099a408934ffbacdb412984b861f6756fa4fde94b51e6a268b8d2ce9fed6f13ee3e8041bb96492310a  deviceinfo
diff --git a/device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install b/device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
deleted file mode 100644
index 70b9e0efe..000000000
--- a/device/community/device-fairphone-fp4/device-fairphone-fp4-nonfree-firmware.post-install
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-rc-update add tqftpserv boot
-rc-update add pd-mapper boot
diff --git a/device/community/device-fairphone-fp4/device-fairphone-fp4.post-install b/device/community/device-fairphone-fp4/device-fairphone-fp4.post-install
index 1ce77a594..515f702fe 100644
--- a/device/community/device-fairphone-fp4/device-fairphone-fp4.post-install
+++ b/device/community/device-fairphone-fp4/device-fairphone-fp4.post-install
@@ -1,2 +1,4 @@
 #!/bin/sh
+rc-update add pd-mapper boot
 rc-update add qbootctl default
+rc-update add tqftpserv boot