From ed01099318b4f08cd2f21015a4227314f3d2dab6 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 3 Feb 2025 02:52:25 -0800
Subject: [PATCH] device-oneplus-enchilada: remove nonfree_firmware subpkg (MR
 6147)

We decided last year to always install the pkgs this subpkg pulled in,
and removing it simplifies the apkbuild.
---
 .../device-oneplus-enchilada/APKBUILD         | 36 ++++++++-----------
 ...ilada-nonfree-firmware-openrc.post-upgrade |  1 -
 ...ice-oneplus-enchilada-openrc.post-install} |  0
 ...vice-oneplus-enchilada-openrc.post-upgrade |  1 +
 4 files changed, 15 insertions(+), 23 deletions(-)
 delete mode 120000 device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade
 rename device/community/device-oneplus-enchilada/{device-oneplus-enchilada-nonfree-firmware-openrc.post-install => device-oneplus-enchilada-openrc.post-install} (100%)
 create mode 120000 device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-upgrade

diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD
index 4dab6a068..aea4a1e1c 100644
--- a/device/community/device-oneplus-enchilada/APKBUILD
+++ b/device/community/device-oneplus-enchilada/APKBUILD
@@ -10,12 +10,16 @@ license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
+	firmware-oneplus-sdm845>=9
+	hexagonrpcd
 	linux-postmarketos-qcom-sdm845
 	mkbootimg
 	postmarketos-base
 	soc-qcom-sdm845
-	soc-qcom-sdm845-ucm
+	soc-qcom-sdm845-modem
+	soc-qcom-sdm845-nonfree-firmware
 	soc-qcom-sdm845-qbootctl
+	soc-qcom-sdm845-ucm
 "
 makedepends="devicepkg-dev"
 source="
@@ -26,39 +30,27 @@ source="
 	q6voiced.conf
 	81-libssc-oneplus-enchilada.rules
 "
-subpackages="
-	$pkgname-nonfree-firmware:nonfree_firmware
-	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
-	$pkgname-pmtest
-"
+subpackages="$pkgname-pmtest $pkgname-openrc"
 
 build() {
 	devicepkg_build $startdir $pkgname
 }
 
 package() {
+	replaces="$pkgname-nonfree-firmware"
 	devicepkg_package $startdir $pkgname
 
 	install -Dm644 "$srcdir"/10-unl0kr.conf \
 		"$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf
+	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \
+		-t "$pkgdir"/usr/lib/udev/rules.d/
+	install -Dm644 q6voiced.conf \
+		"$pkgdir"/etc/conf.d/q6voiced
 }
 
-nonfree_firmware() {
-	pkgdesc="Modem, WiFi and GPU Firmware, also needed for osk-sdl"
-	depends="
-		firmware-oneplus-sdm845>=9
-		hexagonrpcd
-		soc-qcom-sdm845-nonfree-firmware
-		soc-qcom-sdm845-modem
-	"
-
-	install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules -t "$subpkgdir"/usr/lib/udev/rules.d/
-	install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced
-}
-
-nonfree_firmware_openrc() {
-	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
-	replaces="hexagonrpcd-openrc"
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	replaces="hexagonrpcd-openrc $pkgname-nonfree-firmware-openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade
deleted file mode 120000
index 27b06753d..000000000
--- a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-oneplus-enchilada-nonfree-firmware-openrc.post-install
\ No newline at end of file
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-install b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-install
similarity index 100%
rename from device/community/device-oneplus-enchilada/device-oneplus-enchilada-nonfree-firmware-openrc.post-install
rename to device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-install
diff --git a/device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-upgrade b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-upgrade
new file mode 120000
index 000000000..ffa19dd3f
--- /dev/null
+++ b/device/community/device-oneplus-enchilada/device-oneplus-enchilada-openrc.post-upgrade
@@ -0,0 +1 @@
+device-oneplus-enchilada-openrc.post-install
\ No newline at end of file