Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-07-24 15:33:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-09 10:01:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-07-24 17:20:22.000000000 +0200 @@ -1,0 +2,25 @@ +Fri Jul 20 08:57:25 UTC 2012 - fcrozat@suse.com + +- Update to 0.8.6.1: + + Fix systemd path file generation +- Changes from 0.8.6: + + fix flush_area fast-path + + seed random number generator by default for script plugins + + allow plymouth to be built without gtk dependency + + cope with lack of /etc/os-release better + + pull in systemd unit files (bnc#770890) + + add support for new "updates" mode for doing package updates + (only available for some plugins at the moment) +- Add plymouth-restore-suspend.patch: revert commit removing + suspend/resume support, needed for suspend package. +- Add plymouth-systemd-target.patch: add missing symlinks to start + plymouth on shutdown / reboot / kexec (bnc#770764). +- Add plymouth-udevadm-path.patch: adapt to udevadm path on + openSUSE. +- Ensure systemctl daemon-reload is called in post / postun +- Add systemd-no-warning.patch: remove Documentation tag not + handled by systemd v44. +- Update stop-graphical.patch to correct prevent plymouth.quit to + start under runlevel 5 (handled by xdm initscript directly). + +------------------------------------------------------------------- Old: ---- plymouth-0.8.5.1.tar.bz2 New: ---- plymouth-0.8.6.1.tar.bz2 plymouth-restore-suspend.patch plymouth-systemd-target.patch plymouth-udevadm-path.patch systemd-no-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.GuKaRK/_old 2012-07-24 17:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.GuKaRK/_new 2012-07-24 17:20:27.000000000 +0200 @@ -23,7 +23,7 @@ Name: plymouth #Version: %{tarversion}_git%{patchversion} -Version: 0.8.5.1 +Version: 0.8.6.1 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ @@ -41,6 +41,14 @@ Patch3: plymouth-fix-window-size # PATCH-OPENSUSE -- Ensure graphical.target is conflicting with plymouth-wait-quit.service 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 BuildRequires: automake BuildRequires: kernel-headers BuildRequires: libtool @@ -323,6 +331,10 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c @@ -393,11 +405,13 @@ [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration %{_libexecdir}/plymouth/plymouth-update-initrd fi +[ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : %postun if [ $1 -eq 0 ]; then rm -f %{_libdir}/plymouth/default.so rm -f /boot/initrd-plymouth.img + [ -x /bin/systemctl ] && /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %post scripts -p /sbin/mkinitrd_setup ++++++ plymouth-0.8.5.1.tar.bz2 -> plymouth-0.8.6.1.tar.bz2 ++++++ ++++ 69878 lines of diff (skipped) ++++++ plymouth-restore-suspend.patch ++++++
From 152304f3fd2ebd04ca6d49c62dce4ddd2269326a Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcrozat@suse.com> Date: Fri, 20 Jul 2012 11:07:29 +0200 Subject: [PATCH] Revert "libply: remove the unused SPLASH_MODE_SUSPEND and SPLASH_MODE_RESUME"
This reverts commit 02c596757753589f7e49d26eab2759d552f24671. Conflicts: src/libply-splash-core/ply-boot-splash-plugin.h src/plugins/splash/script/script-lib-plymouth.c --- src/libply-splash-core/ply-boot-splash-plugin.h | 2 ++ src/plugins/splash/script/script-lib-plymouth.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h index 2d73d66..1a67526 100644 --- a/src/libply-splash-core/ply-boot-splash-plugin.h +++ b/src/libply-splash-core/ply-boot-splash-plugin.h @@ -38,6 +38,8 @@ typedef enum { PLY_BOOT_SPLASH_MODE_BOOT_UP, PLY_BOOT_SPLASH_MODE_SHUTDOWN, + PLY_BOOT_SPLASH_MODE_SUSPEND, + PLY_BOOT_SPLASH_MODE_RESUME, PLY_BOOT_SPLASH_MODE_UPDATES, PLY_BOOT_SPLASH_MODE_INVALID } ply_boot_splash_mode_t; diff --git a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c index 5c648a6..eb7791e 100644 --- a/src/plugins/splash/script/script-lib-plymouth.c +++ b/src/plugins/splash/script/script-lib-plymouth.c @@ -61,6 +61,12 @@ static script_return_t plymouth_get_mode (script_state_t *state, case PLY_BOOT_SPLASH_MODE_SHUTDOWN: obj = script_obj_new_string ("shutdown"); break; + case PLY_BOOT_SPLASH_MODE_SUSPEND: + obj = script_obj_new_string ("suspend"); + break; + case PLY_BOOT_SPLASH_MODE_RESUME: + obj = script_obj_new_string ("resume"); + break; case PLY_BOOT_SPLASH_MODE_UPDATES: obj = script_obj_new_string ("updates"); break; -- 1.7.10.4 ++++++ plymouth-systemd-target.patch ++++++ 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) ++++++ plymouth-udevadm-path.patch ++++++ 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=-/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 ++++++ stop-graphical.patch ++++++ --- /var/tmp/diff_new_pack.GuKaRK/_old 2012-07-24 17:20:27.000000000 +0200 +++ /var/tmp/diff_new_pack.GuKaRK/_new 2012-07-24 17:20:27.000000000 +0200 @@ -1,7 +1,7 @@ -Index: plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in +Index: plymouth-0.8.6.1/systemd-units/plymouth-quit-wait.service.in =================================================================== ---- plymouth-0.8.5.1.orig/systemd-units/plymouth-quit-wait.service.in -+++ plymouth-0.8.5.1/systemd-units/plymouth-quit-wait.service.in +--- plymouth-0.8.6.1.orig/systemd-units/plymouth-quit-wait.service.in ++++ plymouth-0.8.6.1/systemd-units/plymouth-quit-wait.service.in @@ -1,6 +1,7 @@ [Unit] Description=Wait for Plymouth Boot Screen to Quit @@ -10,3 +10,15 @@ [Service] ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth --wait +Index: plymouth-0.8.6.1/systemd-units/plymouth-quit.service.in +=================================================================== +--- plymouth-0.8.6.1.orig/systemd-units/plymouth-quit.service.in ++++ plymouth-0.8.6.1/systemd-units/plymouth-quit.service.in +@@ -1,6 +1,7 @@ + [Unit] + Description=Terminate Plymouth Boot Screen + After=rc-local.service plymouth-start.service systemd-user-sessions.service ++Conflicts=graphical.target + + [Service] + ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit ++++++ systemd-no-warning.patch ++++++ Index: plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.path.in =================================================================== --- plymouth-0.8.6.1.orig/systemd-units/systemd-ask-password-plymouth.path.in +++ plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.path.in @@ -1,6 +1,5 @@ [Unit] Description=Forward Password Requests to Plymouth Directory Watch -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents DefaultDependencies=no Conflicts=shutdown.target After=plymouth-start.service Index: plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.service.in =================================================================== --- plymouth-0.8.6.1.orig/systemd-units/systemd-ask-password-plymouth.service.in +++ plymouth-0.8.6.1/systemd-units/systemd-ask-password-plymouth.service.in @@ -1,6 +1,5 @@ [Unit] Description=Forward Password Requests to Plymouth -Documentation=http://www.freedesktop.org/wiki/Software/systemd/PasswordAgents DefaultDependencies=no Conflicts=shutdown.target After=plymouth-start.service -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org