From 3e102e95db154f646804b3ddc04fdcde012c598d Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 18:54:17 -0400 Subject: [PATCH] ayn-odin: move openrc scripts to subpackage (MR 5688) --- device/testing/device-ayn-odin/APKBUILD | 12 ++++++++++-- ...t-install => device-ayn-odin-openrc.post-install} | 0 2 files changed, 10 insertions(+), 2 deletions(-) rename device/testing/device-ayn-odin/{device-ayn-odin.post-install => device-ayn-odin-openrc.post-install} (100%) diff --git a/device/testing/device-ayn-odin/APKBUILD b/device/testing/device-ayn-odin/APKBUILD index 70631b19a..f5bf1c77c 100644 --- a/device/testing/device-ayn-odin/APKBUILD +++ b/device/testing/device-ayn-odin/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-ayn-odin pkgdesc="AYN Odin" pkgver=2 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -31,10 +31,11 @@ source=" subpackages=" $pkgname-kernel-odin:kernel_odin $pkgname-kernel-odin-m2:kernel_odin_m2 + $pkgname-openrc $pkgname-phosh:_phosh $pkgname-phosh-m2:_phosh_m2 " -install="$pkgname.post-install" + replaces="hexagonrpcd-openrc" build() { @@ -59,6 +60,13 @@ kernel_odin_m2() { devicepkg_subpackage_kernel $startdir $pkgname $subpkgname } +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install" + + mkdir -p "$subpkgdir" +} + _phosh() { install_if="$pkgname-kernel-odin=$pkgver-r$pkgrel postmarketos-ui-phosh" install -Dm644 "$srcdir"/phoc.ini.odin \ diff --git a/device/testing/device-ayn-odin/device-ayn-odin.post-install b/device/testing/device-ayn-odin/device-ayn-odin-openrc.post-install similarity index 100% rename from device/testing/device-ayn-odin/device-ayn-odin.post-install rename to device/testing/device-ayn-odin/device-ayn-odin-openrc.post-install