From 762b830bd9de591bb1eb5baac94559a1852e64ed Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Wed, 10 Dec 2025 13:47:17 -0500
Subject: [PATCH] samsung-star2lte: install udev configs under `/usr/lib/` and
 split subpackages

Signed-off-by: Aster Boese <asterboese@mailbox.org>
Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7542>
---
 .../device-samsung-star2lte/APKBUILD          | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/device/downstream/device-samsung-star2lte/APKBUILD b/device/downstream/device-samsung-star2lte/APKBUILD
index 3357ef75f..d85a95efc 100644
--- a/device/downstream/device-samsung-star2lte/APKBUILD
+++ b/device/downstream/device-samsung-star2lte/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=device-samsung-star2lte
 pkgdesc="Samsung Galaxy S9+"
 pkgver=3
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -23,6 +23,8 @@ source="
 "
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
+	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware-udev:nonfree_firmware_udev
 	$pkgname-x11
 "
 
@@ -32,18 +34,29 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	# hciattach service for Bluetooth
+	install -Dm755 "$srcdir"/hciattach \
+		-t "$pkgdir"/etc/init.d
+	install -Dm644 "$srcdir"/10-hciattach.rules \
+		-t "$pkgdir"/usr/lib/udev/rules.d
 }
 
 nonfree_firmware() {
-	pkgdesc="WiFi and BT firmware"
+	pkgdesc="$pkgdesc (WiFi and BT firmware)"
 	depends="firmware-samsung-crownlte bluez-deprecated"
 
-	# hciattach service for Bluetooth
-	mkdir "$subpkgdir"
-	install -Dm755 "$srcdir"/hciattach \
-		-t "$subpkgdir"/etc/init.d
-	install -Dm644 "$srcdir"/10-hciattach.rules \
-		-t "$subpkgdir"/etc/udev/rules.d
+	mkdir -p "$subpkgdir"
+}
+
+nonfree_firmware_openrc() {
+	default_openrc
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
+}
+
+nonfree_firmware_udev() {
+	default_udev
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev"
 }
 
 x11() {