From 26f5809a6c5589ada40c960bb1ddb89e9b0a63af Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 30 Sep 2024 21:30:35 -0400
Subject: [PATCH] firmware-oneplus-msm8998: move openrc scripts to subpackage
 (MR 5688)

---
 device/testing/firmware-oneplus-msm8998/APKBUILD  | 15 ++++++++++++---
 ... firmware-oneplus-msm8998-openrc.post-install} |  0
 device/testing/soc-qcom-msm8998/APKBUILD          | 15 ++++++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)
 rename device/testing/firmware-oneplus-msm8998/{firmware-oneplus-msm8998.post-install => firmware-oneplus-msm8998-openrc.post-install} (100%)

diff --git a/device/testing/firmware-oneplus-msm8998/APKBUILD b/device/testing/firmware-oneplus-msm8998/APKBUILD
index 1d17d867c..c1060bf5f 100644
--- a/device/testing/firmware-oneplus-msm8998/APKBUILD
+++ b/device/testing/firmware-oneplus-msm8998/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jami Kettunen <jami.kettunen@protonmail.com>
 pkgname=firmware-oneplus-msm8998
 pkgver=10.0.1
-pkgrel=3
+pkgrel=4
 _commit="a1a0dfd9be6fe250559c01678569e5295a4c335d"
 pkgdesc="Firmware for OnePlus 5/5T"
 url="https://github.com/JamiKettunen/firmware-mainline-oneplus5"
@@ -10,7 +10,6 @@ url="https://github.com/JamiKettunen/firmware-mainline-oneplus5"
 replaces="linux-firmware-ath10k"
 arch="aarch64"
 depends="firmware-qcom-adreno-a530 linux-firmware-qca soc-qcom-msm8998-nonfree-firmware"
-install="$pkgname.post-install"
 license="proprietary"
 options="!check !archcheck !strip !tracedeps"
 source="
@@ -18,7 +17,10 @@ source="
 	30-gpu-firmware.files
 	firmware.files
 "
-subpackages="$pkgname-initramfs:firmware_initramfs"
+subpackages="
+	$pkgname-initramfs:firmware_initramfs
+	$pkgname-openrc
+	"
 builddir="$srcdir/firmware-mainline-oneplus5-$_commit"
 
 package() {
@@ -34,6 +36,13 @@ firmware_initramfs() {
 		"$subpkgdir"/usr/share/mkinitfs/files/30-gpu-firmware.files
 }
 
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install"
+
+	mkdir -p "$subpkgdir"
+}
+
 sha512sums="
 c8997e5b2fde1c57651234be63f84b6f8d62f29fc8b55d8ebb8268cb7636241f7f5d11609bbcae71bd734eca9fd857330755979ad3e432a0c7bc6f3b034ea710  firmware-oneplus-msm8998-a1a0dfd9be6fe250559c01678569e5295a4c335d.tar.gz
 c29e0abb08dd345d88223e29e49290226d0df63470a809ef3c933f7f088f709fd54da6d01c9a7c249b42e84fb86ca39a20a38e5055d3d1c53f37e4a3ab892a16  30-gpu-firmware.files
diff --git a/device/testing/firmware-oneplus-msm8998/firmware-oneplus-msm8998.post-install b/device/testing/firmware-oneplus-msm8998/firmware-oneplus-msm8998-openrc.post-install
similarity index 100%
rename from device/testing/firmware-oneplus-msm8998/firmware-oneplus-msm8998.post-install
rename to device/testing/firmware-oneplus-msm8998/firmware-oneplus-msm8998-openrc.post-install
diff --git a/device/testing/soc-qcom-msm8998/APKBUILD b/device/testing/soc-qcom-msm8998/APKBUILD
index 3eb559200..e2b4f3b4b 100644
--- a/device/testing/soc-qcom-msm8998/APKBUILD
+++ b/device/testing/soc-qcom-msm8998/APKBUILD
@@ -9,7 +9,10 @@ arch="aarch64"
 options="!check !archcheck !tracedeps"
 depends="soc-qcom-sdm845"
 source="iwd-main.conf"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	"
 
 package() {
 	mkdir -p "$pkgdir"
@@ -21,15 +24,21 @@ nonfree_firmware() {
 	soc-qcom-sdm845-modem
 	soc-qcom-sdm845-nonfree-firmware
 	qcom-diag
-	qcom-diag-openrc
 "
-	install="$subpkgname.post-install $subpkgname.post-upgrade"
 
 	mkdir "$subpkgdir"
 	install -D -m644 "$srcdir"/iwd-main.conf \
 		"$subpkgdir"/etc/iwd/main.conf
 }
 
+nonfree_firmware_openrc() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="qcom-diag-openrc"
+
+	mkdir "$subpkgdir"
+}
+
 sha512sums="
 2e3e2be6947e1fb0335ca53ef1f1929b614e3192385f3a42ddb895729793ce185e8c8ad0f16f851ee025c751045cfaf02712b42e89818e37eae532fb59613375  iwd-main.conf
 "