From 9c39fea9b0cdb26b33ff706106e4870bbc963c8f Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Tue, 7 May 2024 16:11:03 -0700 Subject: [PATCH] systemd: use a more general install_if for x11 subpkg (MR 5118) (MR 5563) [ci:skip-build] already built successfully in CI xorg-server-common is a shared dep between xorg-server and xwayland, and this tmpfile config is required for both to work. Without this tmpfile config, Xwayland may fail to start. In the case of GNOME, this is a fatal event. --- extra-repos/systemd/systemd/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extra-repos/systemd/systemd/APKBUILD b/extra-repos/systemd/systemd/APKBUILD index 8bd589eb1..670897b50 100644 --- a/extra-repos/systemd/systemd/APKBUILD +++ b/extra-repos/systemd/systemd/APKBUILD @@ -3,7 +3,7 @@ pkgname=systemd pkgver=255.2 -pkgrel=1 +pkgrel=2 pkgdesc="System and service manager" url="https://github.com/systemd/systemd" arch="all !ppc64le !armhf !s390x" # blocked by pmboostrap not supporting @@ -386,7 +386,7 @@ journald_zcomp() { x11() { pkgdesc="systemd x11" - install_if="$pkgname=$pkgver-r$pkgrel xorg-server" + install_if="$pkgname=$pkgver-r$pkgrel xorg-server-common" amove usr/lib/tmpfiles.d/x11.conf amove etc/X11/xinit/xinitrc.d/50-systemd-user.sh