From 84f2882a2d837eef34f7c4edb50b4e4fd59ece8c394b8711b233c05bd49c68b9 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 20 Sep 2012 09:15:03 +0000 Subject: [PATCH] Accepting request 135128 from home:tittiatcoke:branches:Base:System Update to new version. OBS-URL: https://build.opensuse.org/request/show/135128 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=81 --- ...progress-bar-strip-quotes-if-present.patch | 29 -------- plymouth-0.8.6.1.tar.bz2 | 3 - plymouth-0.8.7.tar.bz2 | 3 + plymouth-after-udev-settle.patch | 13 ---- plymouth-fix-systemd-service.patch | 21 ------ plymouth-remove-pid-file.patch | 69 +++++++++++++++++++ plymouth-systemd-target.patch | 41 ----------- plymouth-udevadm-path.patch | 4 +- plymouth.changes | 13 ++++ plymouth.spec | 19 ++--- 10 files changed, 93 insertions(+), 122 deletions(-) delete mode 100644 0001-ply-text-progress-bar-strip-quotes-if-present.patch delete mode 100644 plymouth-0.8.6.1.tar.bz2 create mode 100644 plymouth-0.8.7.tar.bz2 delete mode 100644 plymouth-after-udev-settle.patch delete mode 100644 plymouth-fix-systemd-service.patch create mode 100644 plymouth-remove-pid-file.patch delete mode 100644 plymouth-systemd-target.patch diff --git a/0001-ply-text-progress-bar-strip-quotes-if-present.patch b/0001-ply-text-progress-bar-strip-quotes-if-present.patch deleted file mode 100644 index 4fd160a..0000000 --- a/0001-ply-text-progress-bar-strip-quotes-if-present.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fe7008c13b38898d78ff4ecf897fea127982fd9b Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Sun, 29 Jul 2012 20:25:21 +0200 -Subject: [PATCH] ply-text-progress-bar: strip quotes if present - -The syntax for sysconfig-style files allows for quotes. ---- - src/libply-splash-core/ply-text-progress-bar.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/src/libply-splash-core/ply-text-progress-bar.c b/src/libply-splash-core/ply-text-progress-bar.c -index 0f4d74e..0b29690 100644 ---- a/src/libply-splash-core/ply-text-progress-bar.c -+++ b/src/libply-splash-core/ply-text-progress-bar.c -@@ -137,6 +137,11 @@ get_os_string (void) - if (pos2 != NULL) - *pos2 = '\0'; - -+ if ((*pos == '\"' && pos2[-1] == '\"') || -+ (*pos == '\'' && pos2[-1] == '\'')) { -+ ++pos; -+ *--pos2 = '\0'; -+ } - asprintf (&os_string, " %s", pos); - } - goto out; --- -1.7.7 - diff --git a/plymouth-0.8.6.1.tar.bz2 b/plymouth-0.8.6.1.tar.bz2 deleted file mode 100644 index aed38ed..0000000 --- a/plymouth-0.8.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:87f9126bb80457c3c9966df765115ea2ebb10b42660be37ede73350bc0f01d1d -size 1155877 diff --git a/plymouth-0.8.7.tar.bz2 b/plymouth-0.8.7.tar.bz2 new file mode 100644 index 0000000..ee2813c --- /dev/null +++ b/plymouth-0.8.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ac8253daddf0a8a48c12f4bf380134cc871a8ed63c7f3fda9f3eba893f43da4d +size 831351 diff --git a/plymouth-after-udev-settle.patch b/plymouth-after-udev-settle.patch deleted file mode 100644 index 92a09e9..0000000 --- a/plymouth-after-udev-settle.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 -@@ -2,7 +2,7 @@ - Description=Show Plymouth Boot Screen - DefaultDependencies=no - Wants=systemd-ask-password-plymouth.path --After=systemd-vconsole-setup.service systemd-udev-settle.service -+After=systemd-vconsole-setup.service udev-trigger.service - Before=systemd-ask-password-plymouth.service - ConditionKernelCommandLine=!plymouth.enable=0 - ConditionPathExists=!@plymouthruntimedir@/pid diff --git a/plymouth-fix-systemd-service.patch b/plymouth-fix-systemd-service.patch deleted file mode 100644 index bd738d4..0000000 --- a/plymouth-fix-systemd-service.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 88c2e7dcf8adff93a335418390fb5f23f83e4f3c Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Mon, 23 Jul 2012 17:36:03 -0400 -Subject: [PATCH] systemd: more updates to start service - -The dashes next to the semi-colons seem to confuse systemd so drop them. ---- - systemd-units/plymouth-start.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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 -@@ -9,5 +9,5 @@ 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=-/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 - Type=forking diff --git a/plymouth-remove-pid-file.patch b/plymouth-remove-pid-file.patch new file mode 100644 index 0000000..637fa09 --- /dev/null +++ b/plymouth-remove-pid-file.patch @@ -0,0 +1,69 @@ +From 512e3a78469af8b0cee02007db6144d1bbc63e01 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi +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 diff --git a/plymouth-systemd-target.patch b/plymouth-systemd-target.patch deleted file mode 100644 index 7869d2d..0000000 --- a/plymouth-systemd-target.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/systemd-units/Makefile.am b/systemd-units/Makefile.am -index 1545a04..94ef49e 100644 ---- a/systemd-units/Makefile.am -+++ b/systemd-units/Makefile.am -@@ -13,6 +13,36 @@ systemd_unit_templates = \ - if ENABLE_SYSTEMD_INTEGRATION - systemdunitdir=$(SYSTEMD_UNIT_DIR) - systemdunit_DATA = $(systemd_unit_templates:.in=) -+ -+install-data-hook: -+ $(MKDIR_P) -m 0755 \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants \ -+ $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/sysinit.target.wants && \ -+ rm -f plymouth-start.service plymouth-read-write.service && \ -+ $(LN_S) ../plymouth-start.service plymouth-start.service && \ -+ $(LN_S) ../plymouth-read-write.service plymouth-read-write.service ) -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/multi-user.target.wants && \ -+ rm -f plymouth-quit.service plymouth-quit-wait.service && \ -+ $(LN_S) ../plymouth-quit.service plymouth-quit.service && \ -+ $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service ) -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/reboot.target.wants && \ -+ rm -f plymouth-reboot.service && \ -+ $(LN_S) ../plymouth-reboot.service plymouth-reboot.service ) -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/kexec.target.wants && \ -+ rm -f plymouth-kexec.service && \ -+ $(LN_S) ../plymouth-kexec.service plymouth-kexec.service ) -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/poweroff.target.wants && \ -+ rm -f plymouth-poweroff.service && \ -+ $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service ) -+ ( cd $(DESTDIR)$(SYSTEMD_UNIT_DIR)/halt.target.wants && \ -+ rm -f plymouth-halt.service && \ -+ $(LN_S) ../plymouth-halt.service plymouth-halt.service ) -+ - endif - - EXTRA_DIST = $(systemd_unit_templates) $(systemdunit_DATA) diff --git a/plymouth-udevadm-path.patch b/plymouth-udevadm-path.patch index 829ae3e..9d95cda 100644 --- a/plymouth-udevadm-path.patch +++ b/plymouth-udevadm-path.patch @@ -2,10 +2,12 @@ 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 -@@ -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 diff --git a/plymouth.changes b/plymouth.changes index 622f5f1..05e2e45 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Sep 20 09:45:07 UTC 2012 - tittiatcoke@gmail.com + +- 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. + ------------------------------------------------------------------- Wed Aug 22 14:04:13 UTC 2012 - fcrozat@suse.com diff --git a/plymouth.spec b/plymouth.spec index 265733b..8f100db 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -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 @@ Patch3: plymouth-fix-window-size 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-UPSTREAM -- Plymouth will check itself if it is already running +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 @@ plugin. %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