Changes to systemd services and targets

buildroot-external/package/spotifyd/0001-Switch-to-system-dbus.patch

@@ -1,25 +0,0 @@
-From 97ae976abdfa5a722bc32885e1ef498a04af2f3d Mon Sep 17 00:00:00 2001
-From: Peter Steenbergen <info@j1nx.nl>
-Date: Sun, 31 Oct 2021 13:36:46 +0100
-Subject: [PATCH 1/1] Switch to system dbus
-
----
- src/dbus_mpris.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/dbus_mpris.rs b/src/dbus_mpris.rs
-index 838f3b3..1e97540 100644
---- a/src/dbus_mpris.rs
-+++ b/src/dbus_mpris.rs
-@@ -114,7 +114,7 @@ fn create_spotify_api(token: &RspotifyToken) -> Spotify {
- async fn create_dbus_server(api_token: RspotifyToken, spirc: Arc<Spirc>, device_name: String) {
-     // TODO: allow other DBus types through CLI and config entry.
-     let (resource, conn) =
--        connection::new_session_sync().expect("Failed to initialize DBus connection");
-+        connection::new_system_sync().expect("Failed to initialize DBus connection");
-     tokio::spawn(async {
-         let err = resource.await;
-         panic!("Lost connection to D-Bus: {}", err);
--- 
-2.33.1
-

buildroot-external/package/spotifyd/spotifyd.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SPOTIFYD_VERSION = ae6dac7a54f899316674ba57ce4a0f9890cd2b1c
+SPOTIFYD_VERSION = ddfcbb2eecd3b5be94533f7374180df412659b4e
 SPOTIFYD_SITE = $(call github,Spotifyd,spotifyd,$(SPOTIFYD_VERSION))
 SPOTIFYD_LICENSE = GPL-3.0
 SPOTIFYD_LICENSE_FILES = LICENSE

buildroot-external/rootfs-overlay/etc/systemd/system/default.target

@@ -0,0 +1 @@
+../../../usr/lib/systemd/system/gui.target

buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-enclosure-gui.service

@@ -0,0 +1 @@
+../../../../../../usr/lib/systemd/user/mycroft-enclosure-gui.service

buildroot-external/rootfs-overlay/home/mycroft/.config/systemd/user/gui.target.wants/mycroft-gui.service

@@ -0,0 +1 @@
+../../../../../../usr/lib/systemd/user/mycroft-gui.service

buildroot-external/rootfs-overlay/usr/lib/systemd/system/gui.target

@@ -0,0 +1,8 @@
+[Unit]
+Description=OpenVoiceOS - Mycroft GUI Interface
+Documentation=man:systemd.special(7)
+Requires=multi-user.target
+Wants=mycroft-gui.service
+Conflicts=rescue.service rescue.target
+After=multi-user.target rescue.service rescue.target display-manager.service
+AllowIsolate=yes

buildroot-external/rootfs-overlay/usr/lib/systemd/user/kdeconnectd.service

@@ -6,4 +6,4 @@ ExecStart=/usr/lib/libexec/kdeconnectd -platform offscreen
 BusName=org.kde.kdeconnect
 
 [Install]
-WantedBy=default.target
+WantedBy=multi-user.target

buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-enclosure-gui.service

@@ -1,6 +1,5 @@
 [Unit]
 Description=Mycroft Enclosure
-PartOf=mycroft.service
 After=mycroft.service
 After=mycroft-messagebus.service
 
@@ -18,4 +17,4 @@ StartLimitBurst=4
 #WatchdogSec=30s
 
 [Install]
-WantedBy=mycroft.service
+WantedBy=gui.target

buildroot-external/rootfs-overlay/usr/lib/systemd/user/mycroft-gui.service

@@ -1,5 +1,7 @@
 [Unit]
 Description=Mycroft GUI
+After=mycroft-enclosure-gui.service
+Requires=mycroft-enclosure-gui.service
 
 [Service]
 ExecStartPre=-/usr/bin/kbuildsycoca5
@@ -8,4 +10,4 @@ StandardOutput=null
 Restart=on-failure
 
 [Install]
-WantedBy=mycroft.service
+WantedBy=gui.target