From 46065a64c4ce394828e9025de543fe585c180298 Mon Sep 17 00:00:00 2001 From: Bart Ribbers Date: Tue, 23 Jul 2024 21:18:38 +0200 Subject: [PATCH] main/postmarketos-ui-weston: add -openrc subpackage (MR 5374) --- main/postmarketos-ui-weston/APKBUILD | 19 ++++++++++++++++--- ...ostmarketos-ui-weston-openrc.post-install} | 0 ...postmarketos-ui-weston-openrc.post-upgrade | 1 + .../postmarketos-ui-weston.post-upgrade | 1 - 4 files changed, 17 insertions(+), 4 deletions(-) rename main/postmarketos-ui-weston/{postmarketos-ui-weston.post-install => postmarketos-ui-weston-openrc.post-install} (100%) create mode 120000 main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-upgrade delete mode 120000 main/postmarketos-ui-weston/postmarketos-ui-weston.post-upgrade diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index cafafbd68..0b44ecb6f 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Bart Ribbers pkgname=postmarketos-ui-weston pkgver=6 -pkgrel=8 +pkgrel=9 pkgdesc="(Wayland) Reference compositor (demo, not a phone interface)" url="https://postmarketos.org" arch="noarch" license="GPL-3.0-or-later" depends=" + bluez dnsmasq elogind - elogind-openrc postmarketos-base-ui postmarketos-base-ui-networkmanager tinydm @@ -28,7 +28,7 @@ _pmb_recommends="htop weston-xwayland xwayland " -install="$pkgname.post-install $pkgname.post-upgrade" +subpackages="$pkgname-openrc" source="start_weston.sh weston.ini.default" options="!check pmb:gpu-accel" # Meta package, no test suite @@ -39,6 +39,19 @@ package() { install -Dm644 "$srcdir"/weston.ini.default \ "$pkgdir"/etc/xdg/weston/weston.ini.default } + +openrc() { + install_if="$pkgname=$pkgver-r$pkgrel openrc" + install="$subpkgname.post-install $subpkgname.post-upgrade" + depends=" + bluez-openrc + elogind-openrc + lightdm-openrc + networkmanager-openrc + " + + mkdir -p "$subpkgdir" +} sha512sums=" 6c9f4f6eeb179b067f1d08c84f35d6a705043432a92c3733491de3c240d48a85e95173e0b4e2f83b737761212a2aec365b1375c077c330735013c9cf36d4390e start_weston.sh 57d2dd91aa6bee6ab73122bf26906de183fceee9f6c28586ac803045344b10c4e3c7e9cd23cada86a585c42221505a2d23572e3d6d1fd757c1ed1c8e1b65644c weston.ini.default diff --git a/main/postmarketos-ui-weston/postmarketos-ui-weston.post-install b/main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-install similarity index 100% rename from main/postmarketos-ui-weston/postmarketos-ui-weston.post-install rename to main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-install diff --git a/main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-upgrade b/main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-upgrade new file mode 120000 index 000000000..649b8fd6d --- /dev/null +++ b/main/postmarketos-ui-weston/postmarketos-ui-weston-openrc.post-upgrade @@ -0,0 +1 @@ +postmarketos-ui-weston-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-ui-weston/postmarketos-ui-weston.post-upgrade b/main/postmarketos-ui-weston/postmarketos-ui-weston.post-upgrade deleted file mode 120000 index d44f5a149..000000000 --- a/main/postmarketos-ui-weston/postmarketos-ui-weston.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -postmarketos-ui-weston.post-install \ No newline at end of file