From 69f0eb80fd7d5294302bd80000f4ecb0d1bb7dff Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 21:02:12 -0400 Subject: [PATCH] xiaomi-elish: move openrc scripts to subpackage (MR 5688) --- device/testing/device-xiaomi-elish/APKBUILD | 14 ++++++++++---- ...all => device-xiaomi-elish-openrc.post-install} | 0 .../device-xiaomi-elish-openrc.post-upgrade | 1 + .../device-xiaomi-elish.post-upgrade | 1 - 4 files changed, 11 insertions(+), 5 deletions(-) rename device/testing/device-xiaomi-elish/{device-xiaomi-elish.post-install => device-xiaomi-elish-openrc.post-install} (100%) create mode 120000 device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade delete mode 120000 device/testing/device-xiaomi-elish/device-xiaomi-elish.post-upgrade diff --git a/device/testing/device-xiaomi-elish/APKBUILD b/device/testing/device-xiaomi-elish/APKBUILD index 0c0399540..accab5498 100644 --- a/device/testing/device-xiaomi-elish/APKBUILD +++ b/device/testing/device-xiaomi-elish/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-xiaomi-elish pkgdesc="Xiaomi Mi Pad 5 Pro" pkgver=3 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -20,7 +20,6 @@ depends=" " makedepends="devicepkg-dev" replaces="hexagonrpcd-openrc" -install="$pkgname.post-install $pkgname.post-upgrade" source=" 81-libssc-xiaomi-elish.rules alsa-ucm-conf/elish.conf @@ -34,6 +33,7 @@ subpackages=" $pkgname-kernel-boe:kernel_boe $pkgname-kernel-csot:kernel_csot $pkgname-nonfree-firmware:nonfree_firmware + $pkgname-openrc " build() { @@ -56,8 +56,6 @@ package() { install -Dm644 "$srcdir"/81-libssc-xiaomi-elish.rules \ "$pkgdir"/usr/lib/udev/rules.d/81-libssc-xiaomi-elish.rules - install -Dm644 "$srcdir"/hexagonrpcd.confd \ - "$pkgdir"/etc/conf.d/hexagonrpcd-sdsp } kernel_boe() { @@ -89,6 +87,14 @@ nonfree_firmware() { mkdir "$subpkgdir" } +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + + install -Dm644 "$srcdir"/hexagonrpcd.confd \ + "$subpkgdir"/etc/conf.d/hexagonrpcd-sdsp +} + sha512sums=" d0e8f2e378130130ac72703aed957f7638e2dd75acf4aa421e1b4592c6cb6d296b652db0d9c242be4e56326760ce18d28c1e36ae553d0b7a7f91e12ab0353f22 81-libssc-xiaomi-elish.rules 7b5def03dc5da28c7449719f0619f9d9ddbd988235b8591304ae4fea0989189d65ca1bc0d43664115f595137ba7896359b1b5f48fd6e350cac5d41ef9b1df869 elish.conf diff --git a/device/testing/device-xiaomi-elish/device-xiaomi-elish.post-install b/device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-install similarity index 100% rename from device/testing/device-xiaomi-elish/device-xiaomi-elish.post-install rename to device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-install diff --git a/device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade b/device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade new file mode 120000 index 000000000..4bb45b701 --- /dev/null +++ b/device/testing/device-xiaomi-elish/device-xiaomi-elish-openrc.post-upgrade @@ -0,0 +1 @@ +device-xiaomi-elish-openrc.post-install \ No newline at end of file diff --git a/device/testing/device-xiaomi-elish/device-xiaomi-elish.post-upgrade b/device/testing/device-xiaomi-elish/device-xiaomi-elish.post-upgrade deleted file mode 120000 index aaeedee15..000000000 --- a/device/testing/device-xiaomi-elish/device-xiaomi-elish.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -device-xiaomi-elish.post-install \ No newline at end of file