Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-10-08 07:16:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2012-08-26 11:33:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-10-08 07:16:43.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Sep 20 09:45:07 UTC 2012 - [email protected] + +- Update to version 0.8.7 + + fix plymouth race at bootup breaking efi/vesa handoff + + Systemd fixes +- Add plymouth-remove-pid-file.patch: remove PID file usage + (bnc#780976) (Thanks to fcrozat) +- Remove upstream patches: plymouth-systemd-target.patch, + 0001-ply-text-progress-bar-strip-quotes-if-present,patch, + plymouth-fix-systemd-service.patch, plymouth-after-udev-settle + due to upstream inclusion. + +------------------------------------------------------------------- Old: ---- 0001-ply-text-progress-bar-strip-quotes-if-present.patch plymouth-0.8.6.1.tar.bz2 plymouth-after-udev-settle.patch plymouth-fix-systemd-service.patch plymouth-systemd-target.patch New: ---- plymouth-0.8.7.tar.bz2 plymouth-remove-pid-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.mTNUhx/_old 2012-10-08 07:16:45.000000000 +0200 +++ /var/tmp/diff_new_pack.mTNUhx/_new 2012-10-08 07:16:45.000000000 +0200 @@ -22,8 +22,7 @@ %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -#Version: %{tarversion}_git%{patchversion} -Version: 0.8.6.1 +Version: 0.8.7 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ @@ -41,22 +40,17 @@ Patch4: stop-graphical.patch # PATCH-OPENSUSE -- Restore suspend / resume state (needed for suspend package) Patch5: plymouth-restore-suspend.patch -# PATCH-FIX-UPSTREAM -- Create targets for plymouth systemd services -Patch6: plymouth-systemd-target.patch # PATCH-OPENSUSE -- Change udevadm path Patch7: plymouth-udevadm-path.patch # PATCH-OPENSUSE -- Remove tag not understood by systemd v44 Patch8: systemd-no-warning.patch -# PATCH-FIX-UPSTREAM -- Recognize quotes often used in sysconfig-style files -Patch9: 0001-ply-text-progress-bar-strip-quotes-if-present.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch -# PATCH-FIX-UPSTREAM -- Fix systemd service file -Patch11: plymouth-fix-systemd-service.patch -# PATCH-FIX-UPSTREAM -- Start plymouth avec udev-trigger.service -Patch12: plymouth-after-udev-settle.patch +# PATCH-FIX-UPSTREAM -- Plymouth will check itself if it is already running (bnc#780976) +Patch11: plymouth-remove-pid-file.patch BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool +BuildRequires: module-init-tools BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(libdrm) @@ -313,13 +307,10 @@ %ifarch %ix86 x86_64 ppc ppc64 %patch5 -p1 %endif -%patch6 -p1 -%patch11 -p1 %patch7 -p1 %patch8 -p1 -%patch9 -p1 %patch10 -p1 -%patch12 -p1 +%patch11 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c ++++++ plymouth-0.8.6.1.tar.bz2 -> plymouth-0.8.7.tar.bz2 ++++++ ++++ 69048 lines of diff (skipped) ++++++ plymouth-remove-pid-file.patch ++++++ >From 512e3a78469af8b0cee02007db6144d1bbc63e01 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi <[email protected]> Date: Mon, 10 Sep 2012 16:43:09 -0400 Subject: [PATCH 1/4] main: fix debug message If plymouthd is already running, then a second invocation will fail with the message: could not log bootup This message is misleading, so fix it. --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: plymouth-0.8.6.1/src/main.c =================================================================== --- plymouth-0.8.6.1.orig/src/main.c +++ plymouth-0.8.6.1/src/main.c @@ -2478,6 +2478,17 @@ main (int argc, */ argv[0][0] = '@'; + state.boot_server = start_boot_server (&state); + + if (state.boot_server == NULL) + { + ply_trace ("plymouthd is already running"); + + if (daemon_handle != NULL) + ply_detach_daemon (daemon_handle, EX_OK); + return EX_OK; + } + state.boot_buffer = ply_buffer_new (); if (attach_to_session) @@ -2492,19 +2503,6 @@ main (int argc, } } - state.boot_server = start_boot_server (&state); - - if (state.boot_server == NULL) - { - ply_trace ("could not log bootup: %m"); - - detach_from_running_session (&state); - - if (daemon_handle != NULL) - ply_detach_daemon (daemon_handle, EX_UNAVAILABLE); - return EX_UNAVAILABLE; - } - state.progress = ply_progress_new (); ply_progress_load_cache (state.progress, Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in =================================================================== --- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in +++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in @@ -5,7 +5,6 @@ Wants=systemd-ask-password-plymouth.path After=systemd-vconsole-setup.service systemd-udev-trigger.service Before=systemd-ask-password-plymouth.service ConditionKernelCommandLine=!plymouth.enable=0 -ConditionPathExists=!@plymouthruntimedir@/pid [Service] ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session ++++++ plymouth-udevadm-path.patch ++++++ --- /var/tmp/diff_new_pack.mTNUhx/_old 2012-10-08 07:16:46.000000000 +0200 +++ /var/tmp/diff_new_pack.mTNUhx/_new 2012-10-08 07:16:46.000000000 +0200 @@ -2,10 +2,12 @@ =================================================================== --- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in +++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in -@@ -9,5 +9,5 @@ ConditionPathExists=!@plymouthruntimedir +@@ -9,7 +9,7 @@ ConditionPathExists=!@plymouthruntimedir [Service] ExecStart=@PLYMOUTH_DAEMON_DIR@/plymouthd --mode=boot --pid-file=@plymouthruntimedir@/pid --attach-to-session -ExecStartPost=-/bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/drm/card0/dev ; /bin/udevadm settle --timeout=30 --exit-if-exists=/sys/class/graphics/fb0/dev ; @PLYMOUTH_CLIENT_DIR@/plymouth show-splash +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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
