From 9a9982353844e593555e8b1f7bb77b375bea6d1b Mon Sep 17 00:00:00 2001 From: Aster Boese Date: Mon, 30 Sep 2024 16:58:40 -0400 Subject: [PATCH] main/postmarketos-base-ui-cage: move openrc scripts to subpackage (MR 5688) --- main/postmarketos-base-ui-cage/APKBUILD | 10 +++++++++- .../postmarketos-base-ui-cage-openrc.post-install | 5 +++++ .../postmarketos-base-ui-cage-openrc.post-upgrade | 1 + .../postmarketos-base-ui-cage.post-install | 4 ---- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-install create mode 120000 main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-upgrade diff --git a/main/postmarketos-base-ui-cage/APKBUILD b/main/postmarketos-base-ui-cage/APKBUILD index 3d987eddf..807fbccfa 100644 --- a/main/postmarketos-base-ui-cage/APKBUILD +++ b/main/postmarketos-base-ui-cage/APKBUILD @@ -2,7 +2,7 @@ # Co-Maintainer: Jenneron pkgname=postmarketos-base-ui-cage pkgver=3 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for shared configuration for cage UIs" arch="all" url="https://postmarketos.org/" @@ -34,6 +34,7 @@ depends=" tinydm-openrc jq " +subpackages="$pkgname-openrc" package() { install -Dm755 "$srcdir"/cage-ui-session.sh -t "$pkgdir"/usr/share/cage-ui/ @@ -41,6 +42,13 @@ package() { install -Dm644 "$srcdir"/cage-ui.desktop -t "$pkgdir"/usr/share/wayland-sessions/ } +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + + mkdir -p "$subpkgdir" +} + sha512sums=" b556bcff9bb62ca6580da5e1749aa4d6b8244ebb5213292a348075196704cc919f8060bff8da66c6f61a1aa071b7ae4d81fddf1b3747e89809196459bc2595d8 cage-ui.desktop 05444666550bbb5ea9a68352ead6ab0f179bf1e57962921bea093dc66342cf30bc7653290b0636d3258ef2c90294fdae017d4b3da5a6ab7060671ac6dd05a967 cage-ui-session.sh diff --git a/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-install b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-install new file mode 100644 index 000000000..2b1d5e0da --- /dev/null +++ b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-install @@ -0,0 +1,5 @@ +#!/bin/sh + +rc-update add seatd default +rc-update add elogind default +rc-update add tinydm default diff --git a/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-upgrade b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-upgrade new file mode 120000 index 000000000..61df6fddd --- /dev/null +++ b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage-openrc.post-upgrade @@ -0,0 +1 @@ +postmarketos-base-ui-cage-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage.post-install b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage.post-install index 90b71155f..38810df7e 100644 --- a/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage.post-install +++ b/main/postmarketos-base-ui-cage/postmarketos-base-ui-cage.post-install @@ -1,7 +1,3 @@ #!/bin/sh -rc-update add seatd default -rc-update add elogind default -rc-update add tinydm default - tinydm-set-session -s /usr/share/wayland-sessions/cage-ui.desktop