From 62611a7b06f41d4d91128aaf3044706afab59c36 Mon Sep 17 00:00:00 2001 From: Robert Mader Date: Wed, 29 Jan 2025 01:51:47 +0100 Subject: [PATCH] device-oneplus-enchilada: Reuse hexagonrpcd config on systemd (MR 6147) By sharing the config file and making the systemd unit files match the openRC ones as close as possible. Also fix the q6voiced.conf path while on it. Co-authored-by: Clayton Craft --- device/community/device-oneplus-enchilada/APKBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/device/community/device-oneplus-enchilada/APKBUILD b/device/community/device-oneplus-enchilada/APKBUILD index aea4a1e1c..b77288755 100644 --- a/device/community/device-oneplus-enchilada/APKBUILD +++ b/device/community/device-oneplus-enchilada/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-enchilada pkgdesc="OnePlus 6" pkgver=14 -pkgrel=4 +pkgrel=5 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -44,16 +44,17 @@ package() { "$pkgdir"/etc/unl0kr.conf.d/10-unl0kr.conf install -Dm644 "$srcdir"/81-libssc-oneplus-enchilada.rules \ -t "$pkgdir"/usr/lib/udev/rules.d/ - install -Dm644 q6voiced.conf \ + install -Dm644 "$srcdir"/q6voiced.conf \ "$pkgdir"/etc/conf.d/q6voiced + install -Dm644 "$srcdir"/hexagonrpcd.confd \ + "$pkgdir"/etc/conf.d/hexagonrpcd-sdsp } openrc() { install_if="$pkgname=$pkgver-r$pkgrel openrc" replaces="hexagonrpcd-openrc $pkgname-nonfree-firmware-openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - - install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp + mkdir -p "$subpkgdir" } pmtest() {