From 09425908d1f53982238c2e06b52435eed28ab095 Mon Sep 17 00:00:00 2001
From: jane400 <pmos@j4ne.de>
Date: Mon, 24 Jun 2024 10:12:13 +0200
Subject: [PATCH] systemd/postmarketos-base-systemd: add base presets (MR 5377)
Co-authored-by: Clayton Craft <clayton@craftyguy.net>
- Removed systemd-timesyncd, already enabled by a preset installed by
the systemd package
- Removed default-disable.preset, it's already provided by the systemd
package
- Removed user services from system preset
---
.../postmarketos-base-systemd/APKBUILD | 9 ++-
.../postmarketos-base-systemd.post-install | 4 --
...r-lib-systemd-system-preset-90-base.preset | 58 +++++++++++++++++++
...usr-lib-systemd-user-preset-90-base.preset | 8 +++
4 files changed, 72 insertions(+), 7 deletions(-)
delete mode 100644 extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install
create mode 100644 extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
create mode 100644 extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-preset-90-base.preset
diff --git a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
index a1a689c21d4..011d18ea16a 100644
--- a/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
+++ b/extra-repos/systemd/postmarketos-base-systemd/APKBUILD
@@ -1,8 +1,8 @@
# Maintainer: Oliver Smith <ollipearanoid@postmarketos.org>
# pmbootstrap installs this, if systemd is selected in "pmbootstrap init".
pkgname=postmarketos-base-systemd
-pkgver=1
-pkgrel=6
+pkgver=2
+pkgrel=0
pkgdesc="Meta package for running postmarketOS with systemd"
url="https://postmarketos.org"
arch="noarch"
@@ -19,7 +19,6 @@ depends="
"
replaces="alpine-baselayout postmarketos-base systemd systemd-logind"
replaces_priority=100
-install="$pkgname.post-install"
_source644="
etc/motd.ansi
@@ -27,6 +26,8 @@ _source644="
etc/systemd/logind.conf
etc/ssh/sshd_config.d/usepam.conf
usr/share/mkinitfs/files/01-initramfs-base-systemd.files
+ usr/lib/systemd/system-preset/90-base.preset
+ usr/lib/systemd/user-preset/90-base.preset
"
_source755="
@@ -60,5 +61,7 @@ fbaa33425e507062a454f11bda48508f261c2144e5c23a20f567dc1cef14ce1dec57f8d934f418f5
2faac294bb632762e247b850f09ff4b544ccff6c462efd8d4faca71ba30bdfa9c460377a0dc88e92c5dbbe251017d164064a56ac0e0410f224b45d4f5f81866c rootfs-etc-systemd-logind.conf
208f53c1d142151277cfcf0a95df839919ce8cb15ec888d50890dc6b3631a994335bfa12194cec856b649f97cfd7c80019c595cc0ea2c5ee96498a3e76a9950b rootfs-etc-ssh-sshd_config.d-usepam.conf
15423bfda57c90ab62fe69865ca4072a0aeb83bf77d9c278257e346f4da81843d010b41003c91ae9f3fcb1c67447645e7c19078eea2bf11312051e6ad7523ad1 rootfs-usr-share-mkinitfs-files-01-initramfs-base-systemd.files
+bbe88651237a65a5cf0976b59aa6885f53d78b265272c116732fd13ead6914c0525f7c7860fccd6c2933fd648ad6d5a4820de481e6913d1f233c4f52cfcd1dc6 rootfs-usr-lib-systemd-system-preset-90-base.preset
+9b3b9abdb3d3541038d37d6870baed81f20be7f5b80874bd142eeb686b08958180b4d4a293912c9760e4353a58d6a5dea43e155002f224d14a157f7a082cde60 rootfs-usr-lib-systemd-user-preset-90-base.preset
605df1f004783d2e0ec5dd99a688bca27502c8c24bc05fb4dc26589b2070b0fbd1cf9bd56e6861d7cda2f8ac8147e7eb040acfd886185c01c8cf9de8b1ce2dcd rootfs-usr-bin-setup-timezone
"
diff --git a/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install b/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install
deleted file mode 100644
index 6c75c2969b8..00000000000
--- a/extra-repos/systemd/postmarketos-base-systemd/postmarketos-base-systemd.post-install
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-systemctl enable systemd-timesyncd
-
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
new file mode 100644
index 00000000000..ba9046d5117
--- /dev/null
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-system-preset-90-base.preset
@@ -0,0 +1,58 @@
+# overrides for systemd
+disable systemd-network*
+disable systemd-homed*
+
+# for basically all Uis
+## system services
+enable apk-polkit-server.service
+enable ModemManager.service
+enable NetworkManager.service
+enable bluetooth.service
+enable haveged.service
+enable systemd-rfkill.service
+enable nftables.service
+enable postmarketos-tweakd.service
+enable kill-pbslash.service
+enable hkdm.service
+
+# Note: technically these two shouldn't be enabled at the same time, but
+# pmos-base-wifi provides should make sure that only one is installed at the
+# same time.
+enable iwd.service
+enable wpa_supplicant.service
+
+# UIs:
+## plasma
+enable hfd-service.service
+enable urfkill.service
+
+enable plasma-mobile.service
+enable sddm.service
+
+## phosh
+enable phosh
+
+## gnome
+enable gdm
+
+# Device specifics:
+# TODO: i like the idea of device/soc specific presets, we should move this out of here
+enable adsp-audio.service
+enable gesture.service
+enable gnss-share
+
+## sensors
+enable hexagonrpcd-sdsp.service
+enable iio-sensor-proxy.service
+
+## qcom
+enable pd-mapper.service
+enable tqftpserv.service
+enable qbootctl.service
+enable q6voiced.service
+enable rmtfs.service
+enable qrtr-ns.service
+enable diag-router.service
+
+## pinephone{,-pro}
+enable eg25-manager.service
diff --git a/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-preset-90-base.preset b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-preset-90-base.preset
new file mode 100644
index 00000000000..23975d1d39e
--- /dev/null
+++ b/extra-repos/systemd/postmarketos-base-systemd/rootfs-usr-lib-systemd-user-preset-90-base.preset
@@ -0,0 +1,8 @@
+## user services
+enable dbus-broker.service
+enable dbus.socket
+enable obex.service
+enable pipewire-pulse.socket
+enable pipewire.socket
+enable pulseaudio.socket
+enable wireplumber.service
--
GitLab