From 749ffd227b092553d208ce07682cc9d7d45476e2 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Mon, 10 Feb 2025 09:00:54 -0800
Subject: [PATCH] device-lenovo-q706f: install hexagonrpcd conf to new location
 (MR 6188)

---
 device/testing/device-lenovo-q706f/APKBUILD | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/device/testing/device-lenovo-q706f/APKBUILD b/device/testing/device-lenovo-q706f/APKBUILD
index ab4321995..f32a6dcbb 100644
--- a/device/testing/device-lenovo-q706f/APKBUILD
+++ b/device/testing/device-lenovo-q706f/APKBUILD
@@ -3,14 +3,14 @@
 pkgname=device-lenovo-q706f
 pkgdesc="Lenovo Xiaoxin Pad Pro 12.6 (Lenovo Tab P12 Pro)"
 pkgver=4
-pkgrel=0
+pkgrel=1
 url="https://postmarketos.org"
 license="MIT"
 arch="aarch64"
 options="!check !archcheck"
 depends="
 	bootmac
-	hexagonrpcd
+	hexagonrpcd>=0.3.2-r3
 	linux-lenovo-q706f
 	make-dynpart-mappings
 	mesa-vulkan-freedreno
@@ -20,7 +20,6 @@ depends="
 	swclock-offset
 "
 makedepends="devicepkg-dev"
-replaces="hexagonrpcd-openrc"
 source="
 	81-libssc-lenovo-q706f.rules
 	alsa-ucm-conf/q706f.conf
@@ -42,7 +41,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
 	# device-specific alsa ucm conf
 	install -Dm644 "$srcdir/q706f.conf" \
 		"$pkgdir/usr/share/alsa/ucm2/Lenovo/q706f/q706f.conf"
@@ -56,6 +54,9 @@ package() {
 
 	install -Dm644 "$srcdir"/81-libssc-lenovo-q706f.rules \
 		"$pkgdir"/usr/lib/udev/rules.d/81-libssc-lenovo-q706f.rules
+
+	install -Dm644 "$srcdir"/hexagonrpcd.confd \
+		"$pkgdir"/usr/share/hexagonrpcd/hexagonrpcd-sdsp.conf
 }
 
 nonfree_firmware() {
@@ -86,9 +87,9 @@ nonfree_firmware_openrc() {
 openrc() {
 	install_if="$pkgname=$pkgver-r$pkgrel openrc"
 	install="$subpkgname.post-install $subpkgname.post-upgrade"
+	depends="hexagonrpcd-openrc"
 
-	install -Dm644 "$srcdir"/hexagonrpcd.confd \
-		"$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp
+	mkdir -p "$subpkgdir"
 }
 
 sha512sums="