From a9fe11c77fa654480335b940d9347fb223ed2b9d Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Wed, 18 Jun 2025 15:11:38 -0700 Subject: [PATCH] main/postmarketos-base-ui: always install sleep-inhibitor.conf Installing this config only when elogind/openrc is installed means that systemd versions of pmOS don't get the fix in !6612 Part-of: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/6682 [ci:skip-build]: already built successfully in CI --- main/postmarketos-base-ui/APKBUILD | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index f6dfa36cc..043e160d9 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui pkgver=41 -pkgrel=0 +pkgrel=1 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -47,8 +47,9 @@ subpackages=" " replaces=" chrony - wpa_supplicant-openrc postmarketos-base + sleep-inhibitor + wpa_supplicant-openrc " replaces_priority=100 # leave plenty for alpine @@ -161,14 +162,10 @@ elogind() { install_if="$pkgname=$pkgver-r$pkgrel elogind" install="$subpkgname.post-install" depends="!systemd-logind sleep-inhibitor-openrc openrc" - replaces=" - elogind - sleep-inhibitor - " + replaces="elogind" provides="postmarketos-base-elogind=$pkgver-r$pkgrel" amove etc/elogind/logind.conf - amove etc/sleep-inhibitor.conf } openrc_settingsd() {