From 6eebfb80fda2fa247d54eff9626479e6e1c6f450 Mon Sep 17 00:00:00 2001 From: Achill Gilgenast Date: Wed, 13 May 2026 09:17:36 +0200 Subject: [PATCH] main/postmarketos-ui-*: add service manager pmb options See https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/merge_requests/2831 Signed-off-by: Aster Boese [ci:skip-vercheck] Part-of: --- main/postmarketos-ui-buffyboard/APKBUILD | 2 +- main/postmarketos-ui-cage/APKBUILD | 2 +- main/postmarketos-ui-console/APKBUILD | 2 +- main/postmarketos-ui-cosmic/APKBUILD | 2 +- main/postmarketos-ui-fbkeyboard/APKBUILD | 2 +- main/postmarketos-ui-gnome-mobile/APKBUILD | 2 +- main/postmarketos-ui-gnome/APKBUILD | 2 +- main/postmarketos-ui-i3wm/APKBUILD | 2 +- main/postmarketos-ui-kodi/APKBUILD | 2 +- main/postmarketos-ui-lomiri/APKBUILD | 2 +- main/postmarketos-ui-lxqt/APKBUILD | 2 +- main/postmarketos-ui-mate/APKBUILD | 2 +- main/postmarketos-ui-moonlight/APKBUILD | 2 +- main/postmarketos-ui-niri/APKBUILD | 18 ++---------------- .../postmarketos-ui-niri-openrc.post-install | 6 ------ .../postmarketos-ui-niri-openrc.post-upgrade | 1 - main/postmarketos-ui-openbox/APKBUILD | 2 +- main/postmarketos-ui-os-installer/APKBUILD | 2 +- main/postmarketos-ui-phosh/APKBUILD | 2 +- main/postmarketos-ui-plasma-bigscreen/APKBUILD | 2 +- main/postmarketos-ui-plasma-desktop/APKBUILD | 2 +- main/postmarketos-ui-plasma-mobile/APKBUILD | 2 +- main/postmarketos-ui-retroarch/APKBUILD | 2 +- main/postmarketos-ui-shelli/APKBUILD | 2 +- main/postmarketos-ui-sway/APKBUILD | 2 +- main/postmarketos-ui-sxmo-de-dwm/APKBUILD | 2 +- main/postmarketos-ui-sxmo-de-i3/APKBUILD | 2 +- main/postmarketos-ui-sxmo-de-river/APKBUILD | 2 +- main/postmarketos-ui-sxmo-de-sway/APKBUILD | 2 +- main/postmarketos-ui-weston/APKBUILD | 2 +- main/postmarketos-ui-xfce4/APKBUILD | 2 +- 31 files changed, 30 insertions(+), 51 deletions(-) delete mode 100644 main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-install delete mode 120000 main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-upgrade diff --git a/main/postmarketos-ui-buffyboard/APKBUILD b/main/postmarketos-ui-buffyboard/APKBUILD index 1a6c1c0d0..478ebadc1 100644 --- a/main/postmarketos-ui-buffyboard/APKBUILD +++ b/main/postmarketos-ui-buffyboard/APKBUILD @@ -15,7 +15,7 @@ depends=" " subpackages="$pkgname-openrc $pkgname-systemd" source="buffyboard.init buffyboard.service" -options="!check" # No tests +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" # No tests package() { install -Dm755 "$srcdir"/buffyboard.init "$pkgdir"/etc/init.d/buffyboard diff --git a/main/postmarketos-ui-cage/APKBUILD b/main/postmarketos-ui-cage/APKBUILD index 3a5453a0e..e1c5687bd 100644 --- a/main/postmarketos-ui-cage/APKBUILD +++ b/main/postmarketos-ui-cage/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="(Wayland) Kiosk WM" arch="all" url="https://postmarketos.org/" license="GPL-3.0-or-later" -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" depends="postmarketos-base-ui-cage" # https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2347 _pmb_groups="seat" diff --git a/main/postmarketos-ui-console/APKBUILD b/main/postmarketos-ui-console/APKBUILD index 125c2b990..b68c549cd 100644 --- a/main/postmarketos-ui-console/APKBUILD +++ b/main/postmarketos-ui-console/APKBUILD @@ -12,7 +12,7 @@ depends=" postmarketos-base-ui-networkmanager wireless-tools " -options="!check pmb:systemd" # No testsuite +options="!check pmb:default-systemd pmb:support-openrc pmb:support-systemd" # No testsuite subpackages="$pkgname-openrc:_openrc" package() { diff --git a/main/postmarketos-ui-cosmic/APKBUILD b/main/postmarketos-ui-cosmic/APKBUILD index ffd7af9f3..df2b190ca 100644 --- a/main/postmarketos-ui-cosmic/APKBUILD +++ b/main/postmarketos-ui-cosmic/APKBUILD @@ -50,7 +50,7 @@ source=" wallpaper.conf " subpackages="$pkgname-openrc" -options="!check pmb:drm pmb:systemd" +options="!check pmb:drm pmb:default-systemd pmb:support-systemd" replaces=" cosmic-applets cosmic-bg diff --git a/main/postmarketos-ui-fbkeyboard/APKBUILD b/main/postmarketos-ui-fbkeyboard/APKBUILD index b3ee6be67..c5ca874ce 100644 --- a/main/postmarketos-ui-fbkeyboard/APKBUILD +++ b/main/postmarketos-ui-fbkeyboard/APKBUILD @@ -17,7 +17,7 @@ depends=" install="$pkgname-openrc.post-install $pkgname-openrc.pre-deinstall $pkgname-openrc.post-upgrade" subpackages="$pkgname-openrc $pkgname-systemd" source="fbkeyboard.init fbkeyboard.service" -options="!check" # No tests +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" # No tests package() { install -Dm755 "$srcdir"/fbkeyboard.init "$pkgdir"/etc/init.d/fbkeyboard diff --git a/main/postmarketos-ui-gnome-mobile/APKBUILD b/main/postmarketos-ui-gnome-mobile/APKBUILD index fa96a59a8..7629bb126 100644 --- a/main/postmarketos-ui-gnome-mobile/APKBUILD +++ b/main/postmarketos-ui-gnome-mobile/APKBUILD @@ -36,7 +36,7 @@ _pmb_recommends=" postmarketos-welcome " subpackages="$pkgname-openrc" -options="!check pmb:systemd" +options="!check pmb:default-systemd pmb:support-openrc pmb:support-systemd" package() { mkdir -p "$pkgdir" diff --git a/main/postmarketos-ui-gnome/APKBUILD b/main/postmarketos-ui-gnome/APKBUILD index 445685ffc..c2bace8d8 100644 --- a/main/postmarketos-ui-gnome/APKBUILD +++ b/main/postmarketos-ui-gnome/APKBUILD @@ -29,7 +29,7 @@ _pmb_recommends=" snapshot " subpackages="$pkgname-openrc" -options="!check pmb:systemd" +options="!check pmb:default-systemd pmb:support-openrc pmb:support-systemd" package() { mkdir -p "$pkgdir" diff --git a/main/postmarketos-ui-i3wm/APKBUILD b/main/postmarketos-ui-i3wm/APKBUILD index 265582608..f7a92a145 100644 --- a/main/postmarketos-ui-i3wm/APKBUILD +++ b/main/postmarketos-ui-i3wm/APKBUILD @@ -29,7 +29,7 @@ depends=" xorg-server " subpackages="$pkgname-openrc" -options="!check" +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" build() { return 0 diff --git a/main/postmarketos-ui-kodi/APKBUILD b/main/postmarketos-ui-kodi/APKBUILD index fb7522e4c..008db2972 100644 --- a/main/postmarketos-ui-kodi/APKBUILD +++ b/main/postmarketos-ui-kodi/APKBUILD @@ -21,7 +21,7 @@ depends=" " subpackages="$pkgname-openrc $pkgname-systemd" source="automount-media.rules kodi.service" -options="!check pmb:drm pmb:systemd" +options="!check pmb:drm pmb:default-systemd pmb:support-openrc pmb:support-systemd" package() { install -Dm644 automount-media.rules \ diff --git a/main/postmarketos-ui-lomiri/APKBUILD b/main/postmarketos-ui-lomiri/APKBUILD index 0f8af06b9..368a42232 100644 --- a/main/postmarketos-ui-lomiri/APKBUILD +++ b/main/postmarketos-ui-lomiri/APKBUILD @@ -71,7 +71,7 @@ source=" superd/lomiri-indicator-location.service superd/lomiri-indicator-network.service " -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc" package() { install -Dm644 "$srcdir"/000-gschema.override \ diff --git a/main/postmarketos-ui-lxqt/APKBUILD b/main/postmarketos-ui-lxqt/APKBUILD index dea0e9d87..9af2dfdcc 100644 --- a/main/postmarketos-ui-lxqt/APKBUILD +++ b/main/postmarketos-ui-lxqt/APKBUILD @@ -60,7 +60,7 @@ source=" xfce4-screensaver-preferences.desktop xscreensaver-settings.desktop " -options="!check" # No testsuite +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" # No testsuite builddir="$srcdir/lxqt-tablet-$pkgver" package() { diff --git a/main/postmarketos-ui-mate/APKBUILD b/main/postmarketos-ui-mate/APKBUILD index fbe4902b0..79e862915 100644 --- a/main/postmarketos-ui-mate/APKBUILD +++ b/main/postmarketos-ui-mate/APKBUILD @@ -53,7 +53,7 @@ source=" onboard-autostart.desktop pmOS-panel.layout " -options="!check pmb:systemd" +options="!check pmb:default-systemd pmb:support-systemd pmb:support-openrc" package() { install -Dm644 -t "$pkgdir"/etc/skel/.config/autostart \ diff --git a/main/postmarketos-ui-moonlight/APKBUILD b/main/postmarketos-ui-moonlight/APKBUILD index df04b66cc..5b322e28a 100644 --- a/main/postmarketos-ui-moonlight/APKBUILD +++ b/main/postmarketos-ui-moonlight/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="(Wayland) Open Source PC client for NVIDIA GameStream, as used by the N arch="all !riscv64 !armhf" url="https://postmarketos.org/" license="GPL-3.0-or-later" -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" depends="postmarketos-base-ui-cage" source="10-moonlight-qt.sh" # https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/issues/2347 diff --git a/main/postmarketos-ui-niri/APKBUILD b/main/postmarketos-ui-niri/APKBUILD index 31b6ecb61..6842863d4 100644 --- a/main/postmarketos-ui-niri/APKBUILD +++ b/main/postmarketos-ui-niri/APKBUILD @@ -30,14 +30,14 @@ _pmb_recommends=" xwayland " _pmb_groups="seat" -subpackages="$pkgname-openrc $pkgname-systemd" +subpackages="$pkgname-systemd" source=" niri-greet.kdl wlgreet.toml greetd-wlgreet.conf " # No tests -options="!check pmb:drm pmb:systemd" +options="!check pmb:drm pmb:default-systemd pmb:support-systemd" package() { # niri configuration for the greeter @@ -53,20 +53,6 @@ package() { "$pkgdir"/usr/lib/systemd/system/greetd.service.d/override.conf } -openrc() { - install_if="$pkgname=$pkgver-r$pkgrel openrc" - install="$subpkgname.post-install $subpkgname.post-upgrade" - depends=" - bluez-openrc - elogind-openrc - modemmanager-openrc - networkmanager-openrc - seatd-openrc - " - - mkdir -p "$subpkgdir" -} - sha512sums=" d679d3900904c89381b923a2ca4b92b65b300162d9ca581a2b11c37b34405c89b0b530821282c94067a3ff351642842fd7cee17d3c10c4357663471f57e1e3f8 niri-greet.kdl 49f9c81c2ab7edc5127818de27c5a4fa74cd7fae403afe5bac641ac44132f8d99f0d78e09d2c85d676f30001b201f0ad1b1160becef0b3d0788173f02f9562fa wlgreet.toml diff --git a/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-install b/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-install deleted file mode 100644 index f9edbd512..000000000 --- a/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -rc-update add elogind default -rc-update add networkmanager default - -exit 0 diff --git a/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-upgrade b/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-upgrade deleted file mode 120000 index cfb9b6de2..000000000 --- a/main/postmarketos-ui-niri/postmarketos-ui-niri-openrc.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -postmarketos-ui-niri-openrc.post-install \ No newline at end of file diff --git a/main/postmarketos-ui-openbox/APKBUILD b/main/postmarketos-ui-openbox/APKBUILD index fd5617a55..cd56000ae 100644 --- a/main/postmarketos-ui-openbox/APKBUILD +++ b/main/postmarketos-ui-openbox/APKBUILD @@ -22,7 +22,7 @@ depends=" xorg-server " subpackages="$pkgname-openrc" -options="!check" +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" package() { mkdir -p "$pkgdir" diff --git a/main/postmarketos-ui-os-installer/APKBUILD b/main/postmarketos-ui-os-installer/APKBUILD index dd3b8deee..2ec997e20 100644 --- a/main/postmarketos-ui-os-installer/APKBUILD +++ b/main/postmarketos-ui-os-installer/APKBUILD @@ -35,7 +35,7 @@ source=" pmos_setup.sh " # NOTE: this UI *only* works with systemd -options="!check pmb:systemd" +options="!check pmb:default-systemd pmb:support-systemd" replaces="gdm" _source440=" diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD index c3d6cb0d1..9b0401f40 100644 --- a/main/postmarketos-ui-phosh/APKBUILD +++ b/main/postmarketos-ui-phosh/APKBUILD @@ -49,7 +49,7 @@ source=" greetd.confd greetd-phrog.conf " -options="!check pmb:drm pmb:systemd" +options="!check pmb:drm pmb:default-systemd pmb:support-openrc pmb:support-systemd" package() { install -Dm644 "$srcdir"/01_postmarketos-ui-phosh.gschema.override \ diff --git a/main/postmarketos-ui-plasma-bigscreen/APKBUILD b/main/postmarketos-ui-plasma-bigscreen/APKBUILD index 3976912cf..0d5bd8d15 100644 --- a/main/postmarketos-ui-plasma-bigscreen/APKBUILD +++ b/main/postmarketos-ui-plasma-bigscreen/APKBUILD @@ -32,7 +32,7 @@ source="$pkgname-$_commit_configs.tar.gz::https://invent.kde.org/plasma-bigscree nymphcast.desktop org.jellyfin.JellyfinDesktop.desktop " -options="!check pmb:systemd" # No tests for a meta package +options="!check pmb:default-systemd pmb:support-systemd" # No tests for a meta package [ "$CARCH" != "loongarch64" ] && subpackages="$subpackages $pkgname-extras" # kodi diff --git a/main/postmarketos-ui-plasma-desktop/APKBUILD b/main/postmarketos-ui-plasma-desktop/APKBUILD index e8e0bf8b6..dbc89d5f8 100644 --- a/main/postmarketos-ui-plasma-desktop/APKBUILD +++ b/main/postmarketos-ui-plasma-desktop/APKBUILD @@ -39,7 +39,7 @@ _pmb_recommends="$_pmb_recommends wayland-utils xdpyinfo " -options="!check pmb:systemd" # No tests for a metapkg +options="!check pmb:default-systemd pmb:support-systemd" # No tests for a metapkg subpackages="$pkgname-openrc $pkgname-systemd" install=" $pkgname-openrc.post-install diff --git a/main/postmarketos-ui-plasma-mobile/APKBUILD b/main/postmarketos-ui-plasma-mobile/APKBUILD index 4dee41aef..ee267ff13 100644 --- a/main/postmarketos-ui-plasma-mobile/APKBUILD +++ b/main/postmarketos-ui-plasma-mobile/APKBUILD @@ -51,7 +51,7 @@ install=" $pkgname-systemd.post-upgrade " replaces="plasma-mobile plasma-mobile-meta" -options="!check pmb:drm pmb:systemd" +options="!check pmb:drm pmb:default-systemd pmb:support-systemd" package() { install -Dm644 \ diff --git a/main/postmarketos-ui-retroarch/APKBUILD b/main/postmarketos-ui-retroarch/APKBUILD index 46ae49d0a..5a734b69e 100644 --- a/main/postmarketos-ui-retroarch/APKBUILD +++ b/main/postmarketos-ui-retroarch/APKBUILD @@ -21,7 +21,7 @@ source=" retroarch.initd postmarketos-ui-retroarch.sh " -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" package() { install -Dm755 retroarch.initd "$pkgdir/etc/init.d/retroarch" diff --git a/main/postmarketos-ui-shelli/APKBUILD b/main/postmarketos-ui-shelli/APKBUILD index e8b13c9cf..b7ebc8200 100644 --- a/main/postmarketos-ui-shelli/APKBUILD +++ b/main/postmarketos-ui-shelli/APKBUILD @@ -16,7 +16,7 @@ depends=" shelli " subpackages="$pkgname-openrc" -options="!check" # No tests +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" # No tests package() { mkdir -p "$pkgdir" diff --git a/main/postmarketos-ui-sway/APKBUILD b/main/postmarketos-ui-sway/APKBUILD index b0ca9ae1d..655a3ee4e 100644 --- a/main/postmarketos-ui-sway/APKBUILD +++ b/main/postmarketos-ui-sway/APKBUILD @@ -37,7 +37,7 @@ source=" etc-sway-config.d-00-logo-key.conf etc-sway-config.d-01-status-bar.conf " -options="!check pmb:drm" # no testsuite +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" # no testsuite replaces="sway" package() { diff --git a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD index 6e5348843..357d3a62a 100644 --- a/main/postmarketos-ui-sxmo-de-dwm/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-dwm/APKBUILD @@ -39,7 +39,7 @@ _pmb_recommends=" " provides="postmarketos-ui-sxmo" provider_priority=5 -options="!check" +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" subpackages="$pkgname-openrc" package() { diff --git a/main/postmarketos-ui-sxmo-de-i3/APKBUILD b/main/postmarketos-ui-sxmo-de-i3/APKBUILD index 4e30212c2..dd302a4fb 100644 --- a/main/postmarketos-ui-sxmo-de-i3/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-i3/APKBUILD @@ -39,7 +39,7 @@ _pmb_recommends=" " provides="postmarketos-ui-sxmo" provider_priority=3 -options="!check" +options="!check pmb:default-openrc pmb:support-openrc pmb:support-systemd" subpackages="$pkgname-openrc" package() { diff --git a/main/postmarketos-ui-sxmo-de-river/APKBUILD b/main/postmarketos-ui-sxmo-de-river/APKBUILD index e90a0c104..ffc909ae7 100644 --- a/main/postmarketos-ui-sxmo-de-river/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-river/APKBUILD @@ -43,7 +43,7 @@ _pmb_recommends=" " provides="postmarketos-ui-sxmo" provider_priority=7 -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" subpackages="$pkgname-openrc" package() { diff --git a/main/postmarketos-ui-sxmo-de-sway/APKBUILD b/main/postmarketos-ui-sxmo-de-sway/APKBUILD index 43e0296f5..155aa2d3a 100644 --- a/main/postmarketos-ui-sxmo-de-sway/APKBUILD +++ b/main/postmarketos-ui-sxmo-de-sway/APKBUILD @@ -42,7 +42,7 @@ _pmb_recommends=" " provides="postmarketos-ui-sxmo" provider_priority=10 -options="!check pmb:drm" +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" subpackages="$pkgname-openrc" package() { diff --git a/main/postmarketos-ui-weston/APKBUILD b/main/postmarketos-ui-weston/APKBUILD index 609c4b75d..c3a06bd4b 100644 --- a/main/postmarketos-ui-weston/APKBUILD +++ b/main/postmarketos-ui-weston/APKBUILD @@ -30,7 +30,7 @@ _pmb_recommends="htop " subpackages="$pkgname-openrc" source="start_weston.sh weston.ini.default" -options="!check pmb:drm" # Meta package, no test suite +options="!check pmb:drm pmb:default-openrc pmb:support-openrc pmb:support-systemd" # Meta package, no test suite package() { install -Dm755 "$srcdir"/start_weston.sh \ diff --git a/main/postmarketos-ui-xfce4/APKBUILD b/main/postmarketos-ui-xfce4/APKBUILD index 9afabaf30..bc4926dee 100644 --- a/main/postmarketos-ui-xfce4/APKBUILD +++ b/main/postmarketos-ui-xfce4/APKBUILD @@ -53,7 +53,7 @@ source=" onboard-autostart.desktop xfce4-phone.sh " -options="!check pmb:systemd" +options="!check pmb:default-systemd pmb:support-openrc pmb:support-systemd" builddir="$srcdir/xfce4-phone-$pkgver" package() {