From fdd119e036a53b9a0def72f1a18519654b940586 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 10:21:50 +0100 Subject: [PATCH] added patch to quit with --retain-splash added plymouth-[sddm,kdm,ldxm,gdm] systemd service [release 0.9.3-2mamba;Thu Oct 26 2017] --- plymouth-0.9.3-quit-retain-splash.patch | 14 ++++++++++++ plymouth-gdm.service | 16 ++++++++++++++ plymouth-kdm.service | 13 +++++++++++ plymouth-lxdm.service | 13 +++++++++++ plymouth-sddm.service | 13 +++++++++++ plymouth.spec | 29 +++++++++++++++++++++---- 6 files changed, 94 insertions(+), 4 deletions(-) create mode 100644 plymouth-0.9.3-quit-retain-splash.patch create mode 100644 plymouth-gdm.service create mode 100644 plymouth-kdm.service create mode 100644 plymouth-lxdm.service create mode 100644 plymouth-sddm.service diff --git a/plymouth-0.9.3-quit-retain-splash.patch b/plymouth-0.9.3-quit-retain-splash.patch new file mode 100644 index 0000000..1338349 --- /dev/null +++ b/plymouth-0.9.3-quit-retain-splash.patch @@ -0,0 +1,14 @@ +diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/systemd-units/plymouth-quit.service.in +--- plymouth.src/systemd-units/plymouth-quit.service.in 2014-02-20 19:38:13.329427597 +1100 ++++ plymouth.patch/systemd-units/plymouth-quit.service.in 2014-02-20 19:40:52.619343839 +1100 +@@ -1,8 +1,9 @@ + [Unit] + Description=Terminate Plymouth Boot Screen + After=rc-local.service plymouth-start.service systemd-user-sessions.service ++Before=getty@tty1.service + + [Service] +-ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit ++ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash + Type=oneshot + TimeoutSec=20 diff --git a/plymouth-gdm.service b/plymouth-gdm.service new file mode 100644 index 0000000..e1bd77b --- /dev/null +++ b/plymouth-gdm.service @@ -0,0 +1,16 @@ +[Unit] +Description=GNOME Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/gdm +Restart=always +IgnoreSIGPIPE=no +BusName=org.gnome.DisplayManager +StandardOutput=syslog +StandardError=inherit + +[Install] +Alias=display-manager.service diff --git a/plymouth-kdm.service b/plymouth-kdm.service new file mode 100644 index 0000000..5292ba6 --- /dev/null +++ b/plymouth-kdm.service @@ -0,0 +1,13 @@ +[Unit] +Description=K Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/kdm -nodaemon +Restart=always +IgnoreSIGPIPE=no +StandardOutput=syslog + +[Install] +Alias=display-manager.service diff --git a/plymouth-lxdm.service b/plymouth-lxdm.service new file mode 100644 index 0000000..33e0ea7 --- /dev/null +++ b/plymouth-lxdm.service @@ -0,0 +1,13 @@ +[Unit] +Description=LXDE Display Manager +Conflicts=getty@tty1.service plymouth-quit.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/sbin/lxdm +Restart=always +IgnoreSIGPIPE=no + +[Install] +Alias=display-manager.service diff --git a/plymouth-sddm.service b/plymouth-sddm.service new file mode 100644 index 0000000..5c08c3a --- /dev/null +++ b/plymouth-sddm.service @@ -0,0 +1,13 @@ +[Unit] +Description=Simple Desktop Display Manager +Documentation=man:sddm(1) man:sddm.conf(5) +Conflicts=getty@tty1.service +Wants=plymouth-deactivate.service +After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service + +[Service] +ExecStart=/usr/bin/sddm +Restart=always + +[Install] +Alias=display-manager.service diff --git a/plymouth.spec b/plymouth.spec index a667bfc..58a6f03 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -1,6 +1,6 @@ Name: plymouth -Epoch: 1 -Version: 0.9.3.20160705git +Epoch: 2 +Version: 0.9.3 Release: 2mamba Summary: Provides a graphical boot animation while the boot process happens in the background Group: System/Kernel and Hardware @@ -10,12 +10,17 @@ Packager: Silvan Calarco URL: http://www.freedesktop.org/wiki/Software/Plymouth Source: https+git://anongit.freedesktop.org/git/plymouth/master/plymouth-%{version}.tar.bz2 Source1: initrd-functions +Source2: plymouth-sddm.service +Source3: plymouth-kdm.service +Source4: plymouth-gdm.service +Source5: plymouth-lxdm.service Patch0: %{name}-0.8.3-libpng-1.4.patch Patch2: %{name}-0.8.3-fix_tty1_echo.patch Patch3: %{name}-0.8.5-dont_disable_fb_if_console_cmdline_is_passed.patch Patch4: plymouth-0.8.8-fix-crash-on-deactivate.patch Patch5: plymouth-0.9.2.20150815git-ensure-start-drm-before-plymouth.patch Patch6: plymouth-0.9.3.20160705git-disable_ShowDelay.patch +Patch7: plymouth-0.9.3-quit-retain-splash.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -108,6 +113,7 @@ This package contains the default themes provides with plymouth. %setup -q %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build ./autogen.sh @@ -135,7 +141,12 @@ This package contains the default themes provides with plymouth. [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall -install -D -m0755 %{SOURCE1} %{buildroot}%{_prefix}/libexec/initrd-functions +#install -D -m0755 %{SOURCE1} %{buildroot}%{_prefix}/libexec/initrd-functions + +install -D -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/sddm-plymouth.service +install -D -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/kdm-plymouth.service +install -D -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/gdm-plymouth.service +install -D -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/lxdm-plymouth.service ## don't quit plymouth on multi-user target to allow smooth transition to X in graphical target #rm -f %{buildroot}/lib/systemd/system/multi-user.target.wants/plymouth-quit-wait.service @@ -166,6 +177,10 @@ fi /bin/plymouth /sbin/plymouthd #%{_bindir}/rhgb-client +%{_unitdir}/sddm-plymouth.service +%{_unitdir}/kdm-plymouth.service +%{_unitdir}/gdm-plymouth.service +%{_unitdir}/lxdm-plymouth.service /%{_lib}/libply-splash-core.so.* /%{_lib}/libply.so.* %{_libdir}/libply-boot-client.so.* @@ -196,7 +211,6 @@ fi /lib/systemd/system/sysinit.target.wants/plymouth-start.service #%{_prefix}/lib/tmpfiles.d/plymouth.conf # NOTE: don't replace with %_libexecdir to avoid breaking x86_64 -%{_prefix}/libexec/initrd-functions %{_prefix}/libexec/plymouth/plymouth-generate-initrd %{_prefix}/libexec/plymouth/plymouth-populate-initrd %{_prefix}/libexec/plymouth/plymouth-update-initrd @@ -263,6 +277,13 @@ fi %{_datadir}/plymouth/themes/tribar/* %changelog +* Thu Oct 26 2017 Silvan Calarco 0.9.3-2mamba +- added patch to quit with --retain-splash +- added plymouth-[sddm,kdm,ldxm,gdm] systemd service + +* Wed Oct 25 2017 Silvan Calarco 0.9.3-1mamba +- update to 0.9.3 + * Tue Apr 18 2017 Silvan Calarco 0.9.3.20160705git-2mamba - don't create initramfs if kernel image isn't found (for chroot in makedist)