From 57562c7597b767fd26fe508feafb27d95dbc7e70 Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Mon, 30 Sep 2024 19:11:08 -0400
Subject: [PATCH] jolla-sbj: move openrc scripts to subpackage (MR 5688)

---
 device/testing/device-jolla-sbj/APKBUILD       | 18 ++++++++++++++----
 ...ll => device-jolla-sbj-openrc.post-install} |  0
 .../device-jolla-sbj-openrc.post-upgrade       |  1 +
 .../device-jolla-sbj.post-upgrade              |  1 -
 4 files changed, 15 insertions(+), 5 deletions(-)
 rename device/testing/device-jolla-sbj/{device-jolla-sbj.post-install => device-jolla-sbj-openrc.post-install} (100%)
 create mode 120000 device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-upgrade
 delete mode 120000 device/testing/device-jolla-sbj/device-jolla-sbj.post-upgrade

diff --git a/device/testing/device-jolla-sbj/APKBUILD b/device/testing/device-jolla-sbj/APKBUILD
index d27ffe888..44ea81803 100644
--- a/device/testing/device-jolla-sbj/APKBUILD
+++ b/device/testing/device-jolla-sbj/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-jolla-sbj
 pkgdesc="Jolla phone"
 pkgver=1
-pkgrel=2
+pkgrel=3
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
@@ -17,8 +17,10 @@ depends="
 	alsa-ucm-conf
 "
 makedepends="devicepkg-dev"
-install="$pkgname.post-install $pkgname.post-upgrade"
-subpackages="$pkgname-nonfree-firmware:nonfree_firmware"
+subpackages="
+	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-openrc
+	"
 source="deviceinfo
 	load-wlan-module
 	wcnss-wlan
@@ -64,7 +66,15 @@ package() {
 nonfree_firmware() {
 	pkgdesc="Firmware for Modem and WiFi"
 	depends="firmware-jolla-sbj-modem firmware-jolla-sbj-wlan msm-modem-downstream"
-	mkdir "$subpkgdir"
+
+	mkdir -p "$subpkgdir"
+}
+
+openrc() {
+	install_if="$pkgname=$pkgver-r$pkgrel openrc"
+	install="$subpkgname.post-install $subpkgname.post-upgrade"
+
+	mkdir -p "$subpkgdir"
 
 	install -Dm755 "$srcdir"/load-wlan-module \
 		"$pkgdir"/etc/init.d/load-wlan-module
diff --git a/device/testing/device-jolla-sbj/device-jolla-sbj.post-install b/device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-install
similarity index 100%
rename from device/testing/device-jolla-sbj/device-jolla-sbj.post-install
rename to device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-install
diff --git a/device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-upgrade b/device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-upgrade
new file mode 120000
index 000000000..0598f6c35
--- /dev/null
+++ b/device/testing/device-jolla-sbj/device-jolla-sbj-openrc.post-upgrade
@@ -0,0 +1 @@
+./device-jolla-sbj-openrc.post-install
\ No newline at end of file
diff --git a/device/testing/device-jolla-sbj/device-jolla-sbj.post-upgrade b/device/testing/device-jolla-sbj/device-jolla-sbj.post-upgrade
deleted file mode 120000
index 5a4e7b467..000000000
--- a/device/testing/device-jolla-sbj/device-jolla-sbj.post-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-device-jolla-sbj.post-install
\ No newline at end of file