From 7c28e203e3dbe515f1319343a741247067ef842efb24e30f6986d0a3acd2838c Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 5 Nov 2012 18:19:28 +0000 Subject: [PATCH 1/2] Accepting request 140245 from home:elvigia:branches:Base:System - Update to an slightly newer git snapshot to fix regression from 0.8.8 - Version 0.8.8 * main: Try to own socket before anything else * main: silently succeed if plymouthd is started a second time * service: start plymouthd unconditionally * x11: make window fullscreen by default * x11: only create windows when necessary - plymoith-sd-notforking.patch: Make plymouthd to not use Service type "forking" - ply-sdunitdir.patch: Must install units in %{_unitdir} as returned by pkg-config not in a hardcoded location. OBS-URL: https://build.opensuse.org/request/show/140245 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=90 --- ply-sdunitdir.patch | 11 ++++++ plymoith-sd-notforking.patch | 52 +++++++++++++++++++++++++++ plymouth-0.8.7.tar.bz2 | 3 -- plymouth-0.8.8_git201211022126.tar.xz | 3 ++ plymouth.changes | 26 ++++++++++++++ plymouth.spec | 14 +++++--- 6 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 ply-sdunitdir.patch create mode 100644 plymoith-sd-notforking.patch delete mode 100644 plymouth-0.8.7.tar.bz2 create mode 100644 plymouth-0.8.8_git201211022126.tar.xz diff --git a/ply-sdunitdir.patch b/ply-sdunitdir.patch new file mode 100644 index 0000000..489996b --- /dev/null +++ b/ply-sdunitdir.patch @@ -0,0 +1,11 @@ +--- configure.ac.orig ++++ configure.ac +@@ -254,7 +254,7 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATIO + + if test x$enable_systemd_integration = xyes; then + AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd]) +- SYSTEMD_UNIT_DIR=/lib/systemd/system ++ SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) + AC_SUBST(SYSTEMD_UNIT_DIR) + fi + diff --git a/plymoith-sd-notforking.patch b/plymoith-sd-notforking.patch new file mode 100644 index 0000000..d8ffb3e --- /dev/null +++ b/plymoith-sd-notforking.patch @@ -0,0 +1,52 @@ +--- systemd-units/plymouth-halt.service.in.orig ++++ systemd-units/plymouth-halt.service.in +@@ -6,6 +6,5 @@ DefaultDependencies=no + ConditionKernelCommandLine=!plymouth.enable=0 + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-Type=forking +--- systemd-units/plymouth-kexec.service.in.orig ++++ systemd-units/plymouth-kexec.service.in +@@ -6,6 +6,5 @@ DefaultDependencies=no + ConditionKernelCommandLine=!plymouth.enable=0 + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-Type=forking +--- systemd-units/plymouth-poweroff.service.in.orig ++++ systemd-units/plymouth-poweroff.service.in +@@ -6,6 +6,5 @@ DefaultDependencies=no + ConditionKernelCommandLine=!plymouth.enable=0 + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-Type=forking +--- systemd-units/plymouth-reboot.service.in.orig ++++ systemd-units/plymouth-reboot.service.in +@@ -6,6 +6,5 @@ DefaultDependencies=no + ConditionKernelCommandLine=!plymouth.enable=0 + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=shutdown --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=shutdown --attach-to-session + ExecStartPost=-@PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-Type=forking +--- systemd-units/plymouth-start.service.in.orig ++++ systemd-units/plymouth-start.service.in +@@ -7,8 +7,7 @@ Before=systemd-ask-password-plymouth.ser + ConditionKernelCommandLine=!plymouth.enable=0 + + [Service] +-ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session ++ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --no-daemon --mode=boot --attach-to-session + ExecStartPost=-/sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /sbin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash +-Type=forking + KillMode=none + SendSIGKILL=no diff --git a/plymouth-0.8.7.tar.bz2 b/plymouth-0.8.7.tar.bz2 deleted file mode 100644 index ee2813c..0000000 --- a/plymouth-0.8.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ac8253daddf0a8a48c12f4bf380134cc871a8ed63c7f3fda9f3eba893f43da4d -size 831351 diff --git a/plymouth-0.8.8_git201211022126.tar.xz b/plymouth-0.8.8_git201211022126.tar.xz new file mode 100644 index 0000000..8313301 --- /dev/null +++ b/plymouth-0.8.8_git201211022126.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:333fced6dc5d061db6d71903256ff1d9366bb8687fc829539ddb027e4693f6df +size 791860 diff --git a/plymouth.changes b/plymouth.changes index a1e458c..06b332f 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Nov 5 17:35:39 UTC 2012 - crrodriguez@opensuse.org + +- Update to an slightly newer git snapshot to fix regression + from 0.8.8 + +------------------------------------------------------------------- +Thu Nov 1 21:36:22 UTC 2012 - crrodriguez@opensuse.org + +- Version 0.8.8 + +* main: Try to own socket before anything else +* main: silently succeed if plymouthd is started a second time +* service: start plymouthd unconditionally +* x11: make window fullscreen by default +* x11: only create windows when necessary + +------------------------------------------------------------------- +Thu Nov 1 20:35:34 UTC 2012 - crrodriguez@opensuse.org + +- plymoith-sd-notforking.patch: Make plymouthd to not use + Service type "forking" + +- ply-sdunitdir.patch: Must install units in %{_unitdir} as + returned by pkg-config not in a hardcoded location. + ------------------------------------------------------------------- Fri Oct 12 08:59:08 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 952023d..fdc9c9b 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -22,13 +22,13 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.8.7 +Version: 0.8.8_git201211022126 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ Group: System/Base Url: http://freedesktop.org/software/plymouth/releases -Source0: %{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Source1: boot-duration # PATCH-OPENSUSE -- Support the openSUSE initrd Patch1: suse-initrd-support @@ -47,6 +47,8 @@ Patch8: systemd-no-warning.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976) Patch11: plymouth-remove-pid-file.patch +Patch12: plymoith-sd-notforking.patch +Patch13: ply-sdunitdir.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -60,6 +62,7 @@ BuildRequires: pkgconfig(libdrm_intel) BuildRequires: pkgconfig(libdrm_nouveau) BuildRequires: pkgconfig(libdrm_radeon) BuildRequires: pkgconfig(libkms) +BuildRequires: pkgconfig(systemd) Requires: %{name}-branding Requires: gnu-unifont-bitmap-fonts %ifarch %ix86 x86_64 ppc ppc64 @@ -310,7 +313,8 @@ plugin. %patch8 -p1 %patch10 -p1 #patch11 -p1 - +%patch12 +%patch13 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -334,7 +338,7 @@ autoreconf -fiv --without-gdm-autostart-file \ --with-release-file=/etc/os-release -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install @@ -476,7 +480,7 @@ fi %{_localstatedir}/spool/plymouth %{_mandir}/man?/* %ghost %{_localstatedir}/lib/plymouth/boot-duration -/lib/systemd/system/* +%{_unitdir}/* %files devel %defattr(-, root, root) From 6b24cdfa4a3c51bdab1c965f32ab75d8617c1bc9cc4baab25eaa6ba536f93cec Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 6 Nov 2012 18:14:20 +0000 Subject: [PATCH 2/2] Accepting request 140489 from home:tittiatcoke:branches:Base:System Dracut scripts OBS-URL: https://build.opensuse.org/request/show/140489 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=91 --- plymouth-dracut-path.patch | 13 +++++++++++++ plymouth.changes | 9 +++++++++ plymouth.spec | 19 +++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 plymouth-dracut-path.patch diff --git a/plymouth-dracut-path.patch b/plymouth-dracut-path.patch new file mode 100644 index 0000000..604ca76 --- /dev/null +++ b/plymouth-dracut-path.patch @@ -0,0 +1,13 @@ +--- scripts/plymouth-populate-initrd.in 2012-08-21 01:25:52.000000000 +0200 ++++ scripts/plymouth-populate-initrd.in 2012-11-01 18:27:22.760029873 +0100 +@@ -372,8 +372,8 @@ + [ -z "$INITRDDIR" ] && usage error + + mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes +-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd +-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth ++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /usr/sbin/plymouthd ++inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /usr/bin/plymouth + inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR + inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR + inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR diff --git a/plymouth.changes b/plymouth.changes index 06b332f..3bcf526 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Nov 6 18:07:29 UTC 2012 - tittiatcoke@gmail.com + +- Provide the scripts to integrate Plymouth in dracut as a + separate package. + +- Added patch (plymouth-dracut-path.patch) to correct the paths + inside the specific plymouth-dracut scripts + ------------------------------------------------------------------- Mon Nov 5 17:35:39 UTC 2012 - crrodriguez@opensuse.org diff --git a/plymouth.spec b/plymouth.spec index fdc9c9b..a388c72 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -44,6 +44,8 @@ Patch5: plymouth-restore-suspend.patch Patch7: plymouth-udevadm-path.patch # PATCH-OPENSUSE -- Remove tag not understood by systemd v44 Patch8: systemd-no-warning.patch +# PATCH-OPENSUSE -- prefix is /usr/sbin and /usr/bin +Patch9: plymouth-dracut-path.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch # PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976) Patch11: plymouth-remove-pid-file.patch @@ -140,6 +142,15 @@ Requires: %{name} = %{version} This package contains utilities that integrate with Plymouth including a boot log viewing application. +%package dracut +Summary: Plymouth related utilities for dracut +Group: System/Base +Supplements: packageand(plymouth:dracut) +Requires: %{name} = %{version} + +%description dracut +This package contains utilities that integrate dracut with Plymouth + %package x11-renderer Summary: Plymouth X11 renderer Group: System/Base @@ -311,6 +322,7 @@ plugin. %endif %patch7 -p1 %patch8 -p1 +%patch9 -p0 %patch10 -p1 #patch11 -p1 %patch12 @@ -344,8 +356,6 @@ make %{?_smp_mflags} V=1 %make_install rm -f %{buildroot}/%{_bindir}/rhgb-client -rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd -rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd #Link the plymouth client binary also to /bin until the move to /usr is completed mkdir %{buildroot}/bin @@ -482,6 +492,11 @@ fi %ghost %{_localstatedir}/lib/plymouth/boot-duration %{_unitdir}/* +%files dracut +%defattr(-, root, root) +%{_libexecdir}/plymouth/plymouth-populate-initrd +%{_libexecdir}/plymouth/plymouth-generate-initrd + %files devel %defattr(-, root, root) %{plymouth_libdir}/libply.so