From 58017f46b26b9963ae75ec537e0bf1de47e0ec7f Mon Sep 17 00:00:00 2001
From: Aster Boese <asterboese@mailbox.org>
Date: Tue, 9 Dec 2025 23:06:09 -0500
Subject: [PATCH] xiaomi-beryllium: 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/7534>
---
 .../device-xiaomi-beryllium/APKBUILD          | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/device/community/device-xiaomi-beryllium/APKBUILD b/device/community/device-xiaomi-beryllium/APKBUILD
index 520314ce0..1ff7d5c41 100644
--- a/device/community/device-xiaomi-beryllium/APKBUILD
+++ b/device/community/device-xiaomi-beryllium/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=device-xiaomi-beryllium
 pkgdesc="Xiaomi Poco F1"
 pkgver=14
-pkgrel=1
+pkgrel=2
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
@@ -19,6 +19,7 @@ makedepends="devicepkg-dev"
 subpackages="
 	$pkgname-nonfree-firmware:nonfree_firmware
 	$pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc
+	$pkgname-nonfree-firmware-udev:nonfree_firmware_udev
 	$pkgname-kernel-tianma:kernel_tianma
 	$pkgname-kernel-ebbg:kernel_ebbg
 "
@@ -38,6 +39,13 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
+
+	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
+		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-beryllium.rules
+	install -Dm644 "$srcdir"/q6voiced.conf \
+		"$pkgdir"/etc/conf.d/q6voiced
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }
 
 nonfree_firmware() {
@@ -49,12 +57,8 @@ nonfree_firmware() {
 		hexagonrpcd
 	"
 
-	install -Dm644 "$srcdir"/81-libssc-xiaomi-beryllium.rules \
-		"$subpkgdir"/etc/udev/rules.d/81-libssc-xiaomi-beryllium.rules
-	install -Dm644 "$srcdir"/q6voiced.conf \
-		"$subpkgdir"/etc/conf.d/q6voiced
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
+	amove etc/conf.d/q6voiced
+	amove usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }
 
 nonfree_firmware_openrc() {
@@ -65,6 +69,12 @@ nonfree_firmware_openrc() {
 	mkdir -p "$subpkgdir"
 }
 
+nonfree_firmware_udev() {
+	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel udev"
+
+	default_udev
+}
+
 kernel_tianma() {
 	pkgdesc="Tianma Panel. To know which panel your device use and the status of the port, Visit the Poco F1 wiki page: https://wiki.postmarketos.org/wiki/Xiaomi_Poco_F1_(xiaomi-beryllium)"
 	depends="linux-postmarketos-qcom-sdm845"