From 8251a6956f7bb91ba457501fbe18b0cd2cd46b17 Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 16:40:06 -0400 Subject: [PATCH] oneplus-fajita: move openrc scripts to subpackage (MR 5688) --- device/community/device-oneplus-fajita/APKBUILD | 16 ++++++++++++---- ...-fajita-nonfree-firmware-openrc.post-install} | 0 ...s-fajita-nonfree-firmware-openrc.post-upgrade | 1 + ...-oneplus-fajita-nonfree-firmware.post-upgrade | 1 - 4 files changed, 13 insertions(+), 5 deletions(-) rename device/community/device-oneplus-fajita/{device-oneplus-fajita-nonfree-firmware.post-install => device-oneplus-fajita-nonfree-firmware-openrc.post-install} (100%) create mode 120000 device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-upgrade delete mode 120000 device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-upgrade diff --git a/device/community/device-oneplus-fajita/APKBUILD b/device/community/device-oneplus-fajita/APKBUILD index b18b37ebb..becd95eea 100644 --- a/device/community/device-oneplus-fajita/APKBUILD +++ b/device/community/device-oneplus-fajita/APKBUILD @@ -4,7 +4,7 @@ pkgname=device-oneplus-fajita pkgdesc="OnePlus 6T" pkgver=14 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -26,7 +26,11 @@ source=" q6voiced.conf 81-libssc-oneplus-fajita.rules " -subpackages="$pkgname-nonfree-firmware:nonfree_firmware $pkgname-pmtest" +subpackages=" + $pkgname-nonfree-firmware:nonfree_firmware + $pkgname-nonfree-firmware-openrc:nonfree_firmware_openrc + $pkgname-pmtest + " build() { devicepkg_build $startdir $pkgname @@ -48,11 +52,15 @@ nonfree_firmware() { soc-qcom-sdm845-modem " replaces="hexagonrpcd-openrc" + + install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/ +} + +nonfree_firmware_openrc() { + install_if="$pkgname-nonfree-firmware=$pkgver-r$pkgrel openrc" install="$subpkgname.post-install $subpkgname.post-upgrade" - mkdir "$subpkgdir" install -Dm644 q6voiced.conf "$subpkgdir"/etc/conf.d/q6voiced - install -Dm644 "$srcdir"/81-libssc-oneplus-fajita.rules -t "$subpkgdir"/usr/lib/udev/rules.d/ install -Dm644 "$srcdir"/hexagonrpcd.confd "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp } diff --git a/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-install b/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-install similarity index 100% rename from device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-install rename to device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-install diff --git a/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-upgrade b/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-upgrade new file mode 120000 index 000000000..764d45492 --- /dev/null +++ b/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware-openrc.post-upgrade @@ -0,0 +1 @@ +./device-oneplus-fajita-nonfree-firmware-openrc.post-install \ No newline at end of file diff --git a/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-upgrade b/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-upgrade deleted file mode 120000 index 82fa9ae20..000000000 --- a/device/community/device-oneplus-fajita/device-oneplus-fajita-nonfree-firmware.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -device-oneplus-fajita-nonfree-firmware.post-install \ No newline at end of file