From b3c4334b78b535ebe305676e4e3f0a8ca768f9f8 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 10 Feb 2025 09:01:35 -0800
Subject: [PATCH] device-xiaomi-nabu: install hexagonrpcd conf to new location
 (MR 6188)

---
 device/testing/device-xiaomi-nabu/APKBUILD | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/device/testing/device-xiaomi-nabu/APKBUILD b/device/testing/device-xiaomi-nabu/APKBUILD
index a97dcae4c..9bb27901d 100644
--- a/device/testing/device-xiaomi-nabu/APKBUILD
+++ b/device/testing/device-xiaomi-nabu/APKBUILD
@@ -2,14 +2,14 @@
 pkgname=device-xiaomi-nabu
 pkgdesc="Xiaomi Pad 5"
 pkgver=2
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check	!archcheck"
 depends="
 	linux-postmarketos-qcom-sm8150-nabu
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
 	mkbootimg
@@ -17,7 +17,6 @@ depends="
 	swclock-offset
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 source="
 	deviceinfo
 	30-gpu-firmware.files
@@ -75,17 +74,16 @@ nonfree_firmware() {
 		hexagonrpcd
 		tqftpserv
 		"
-		mkdir "$subpkgdir"
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$subpkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }
 
 nonfree_firmware_openrc() {
 	install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install"
-	replaces="hexagonrpcd-openrc"
+	depends="hexagonrpcd-openrc"
 	install -Dm755 "$srcdir"/no-hexagonrpcd-on-suspend.sh \
 		"$subpkgdir"/etc/elogind/system-sleep/no-hexagonrpcd-on-suspend.sh
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
 }
 
 alsa() {