From 4ad6ad0b49d0d57f1ce709acdeea10907e4993fb Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 30 Sep 2024 22:09:51 -0400
Subject: [PATCH] soc-qcom-sdm660: move openrc scripts to subpackage (MR 5688)

---
 device/testing/soc-qcom-sdm660/APKBUILD       | 20 ++++++++++++++-----
 ...soc-qcom-sdm660-rproc-openrc.post-install} |  0
 .../soc-qcom-sdm660-rproc-openrc.post-upgrade |  1 +
 .../soc-qcom-sdm660-rproc.post-upgrade        |  1 -
 4 files changed, 16 insertions(+), 6 deletions(-)
 rename device/testing/soc-qcom-sdm660/{soc-qcom-sdm660-rproc.post-install => soc-qcom-sdm660-rproc-openrc.post-install} (100%)
 create mode 120000 device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-upgrade
 delete mode 120000 device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade

diff --git a/device/testing/soc-qcom-sdm660/APKBUILD b/device/testing/soc-qcom-sdm660/APKBUILD
index fa40c77c4..b522f5e09 100644
--- a/device/testing/soc-qcom-sdm660/APKBUILD
+++ b/device/testing/soc-qcom-sdm660/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=soc-qcom-sdm660
 pkgdesc="Common package for Qualcomm SDM630/636/660 devices"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="BSD-3-Clause"
 arch="aarch64"
@@ -10,6 +10,7 @@ options="!check !archcheck !tracedeps pmb:cross-native"
 depends="swclock-offset"
 subpackages="
 	$pkgname-rproc
+	$pkgname-rproc-openrc:rproc_openrc
 	$pkgname-nonfree-firmware:nonfree_firmware
 "
 source="sdm660-adreno-quirks.sh"
@@ -26,14 +27,23 @@ rproc() {
 		bootmac
 		msm-modem
 		qcom-diag
-		qcom-diag-openrc
 		rmtfs
-		rmtfs-openrc
 		tqftpserv
-		tqftpserv-openrc
 	"
+
+	mkdir -p "$subpkgdir"
+}
+
+rproc_openrc() {
+	install_if="$pkgname-rproc=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
-	mkdir "$subpkgdir"
+	depends="
+		qcom-diag-openrc
+		rmtfs-openrc
+		tqftpserv-openrc
+		"
+
+	mkdir -p "$subpkgdir"
 }
 
 nonfree_firmware() {
diff --git a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-install
similarity index 100%
rename from device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-install
rename to device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-install
diff --git a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-upgrade b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-upgrade
new file mode 120000
index 000000000..17ed6148e
--- /dev/null
+++ b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc-openrc.post-upgrade
@@ -0,0 +1 @@
+soc-qcom-sdm660-rproc-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade b/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade
deleted file mode 120000
index 814ad5b9f..000000000
--- a/device/testing/soc-qcom-sdm660/soc-qcom-sdm660-rproc.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-soc-qcom-sdm660-rproc.post-install
\ No newline at end of file