From 51fb6224c6a4521a57d444dd550988c16bfaeeea Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mar 26 2013 15:52:04 +0000 Subject: Update to snapshot to fix systemd vconsole issue halfline, halfline_laptop: can you add "Wants: systemd-vconsole-setup.service" to plymouth? sure halfline, thanks --- diff --git a/.gitignore b/.gitignore index 5e1f06f..88d6984 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ plymouth-0.8.4.tar.bz2 /plymouth-0.8.6.2.tar.bz2 /plymouth-0.8.7.tar.bz2 /plymouth-0.8.8.tar.bz2 +/plymouth-0.8.9.tar.bz2 diff --git a/fix-crash.patch b/fix-crash.patch deleted file mode 100644 index 66fbaad..0000000 --- a/fix-crash.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 6ccedf7b6ecdc8314ed97355cfe5499fffb13a1e Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 1 Nov 2012 17:04:33 -0400 -Subject: [PATCH 1/3] main: if deactivate when already deactivated return - immediately - -We were trying to ignore second deactivate requests, but -were instead crashing because we're trying to use a nullified -trigger. - -This commit makes sure things don't go crashy when a user -does "plymouth deactivate" on an already deactivated plymouthd. ---- - src/main.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/main.c b/src/main.c -index 88e5002..60ca28f 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -1135,7 +1135,13 @@ static void - on_deactivate (state_t *state, - ply_trigger_t *deactivate_trigger) - { -- if ((state->deactivate_trigger != NULL) || state->is_inactive) -+ if (state->is_inactive) -+ { -+ ply_trigger_pull (deactivate_trigger, NULL); -+ return; -+ } -+ -+ if (state->deactivate_trigger != NULL) - { - ply_trigger_add_handler (state->deactivate_trigger, - (ply_trigger_handler_t) --- -1.7.12.1 - - -From b3548ebaf76d222f56d6a7b34c5940b930d47609 Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Thu, 1 Nov 2012 17:16:07 -0400 -Subject: [PATCH 2/3] two-step: don't update progress when idle - -We've already reach a state where we aren't drawing anymore, etc, -so don't update progress and potentially fire off animations -that won't be seen. ---- - src/plugins/splash/two-step/plugin.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/plugins/splash/two-step/plugin.c b/src/plugins/splash/two-step/plugin.c -index 2998beb..541a108 100644 ---- a/src/plugins/splash/two-step/plugin.c -+++ b/src/plugins/splash/two-step/plugin.c -@@ -1067,6 +1067,9 @@ on_boot_progress (ply_boot_splash_plugin_t *plugin, - if (plugin->state != PLY_BOOT_SPLASH_DISPLAY_NORMAL) - return; - -+ if (plugin->is_idle) -+ return; -+ - if (percent_done >= SHOW_ANIMATION_PERCENT) - { - if (plugin->stop_trigger == NULL) --- -1.7.12.1 - - -From a6129abfc527ac247685d80fc5c20144be1badca Mon Sep 17 00:00:00 2001 -From: Ray Strode -Date: Fri, 2 Nov 2012 17:26:41 -0400 -Subject: [PATCH 3/3] main: make plymouth show-splash idempotent - -plymouth show-splash causes hairy things, that should only happen once, -like activating renderers to happen. - -This commit makes subsequent show-splash calls be no-ops. ---- - src/main.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/main.c b/src/main.c -index 60ca28f..ff06163 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -113,6 +113,7 @@ typedef struct - uint32_t should_be_attached : 1; - uint32_t should_retain_splash : 1; - uint32_t is_inactive : 1; -+ uint32_t is_shown : 1; - uint32_t should_force_details : 1; - - char *kernel_console_tty; -@@ -871,6 +872,12 @@ on_show_splash (state_t *state) - { - bool has_display; - -+ if (state->is_shown) -+ { -+ ply_trace ("show splash called while already shown"); -+ return; -+ } -+ - if (state->is_inactive) - { - ply_trace ("show splash called while inactive"); -@@ -884,6 +891,8 @@ on_show_splash (state_t *state) - return; - } - -+ state->is_shown = true; -+ - check_for_consoles (state, state->default_tty, true); - - has_display = ply_list_get_length (state->pixel_displays) > 0 || -@@ -1012,6 +1021,8 @@ dump_details_and_quit_splash (state_t *state) - if (state->boot_splash != NULL) - ply_boot_splash_hide (state->boot_splash); - -+ state->is_shown = false; -+ - quit_splash (state); - } - -@@ -1116,6 +1127,8 @@ on_boot_splash_idle (state_t *state) - ply_renderer_deactivate (state->renderer); - if (state->boot_splash != NULL) - ply_boot_splash_hide (state->boot_splash); -+ -+ state->is_shown = false; - } - - ply_trace ("quitting splash"); --- -1.7.12.1 - diff --git a/fix-fed-up.patch b/fix-fed-up.patch deleted file mode 100644 index 3c09c98..0000000 --- a/fix-fed-up.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a9703fb6e3112bbf63ae0f1b0d4d1b5c55befd32 Mon Sep 17 00:00:00 2001 -From: Will Woods -Date: Thu, 29 Nov 2012 10:25:03 -0500 -Subject: [PATCH] populate-initrd: If PLYMOUTH_THEME_NAME is set, write it - into plymouthd.conf - -You can set PLYMOUTH_THEME_NAME when building initramfs to get a -different theme into initramfs, but this doesn't change the default -theme, so the resulting initramfs won't actually use the theme we -installed. - -This patch makes plymouth-populate-initrd rewrite the 'Theme=XXX' line -in plymouthd.conf, so plymouth will use the theme we install. ---- - scripts/plymouth-populate-initrd.in | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in -index 8d1eec0..d901a9b 100755 ---- a/scripts/plymouth-populate-initrd.in -+++ b/scripts/plymouth-populate-initrd.in -@@ -8,6 +8,7 @@ - [ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@" - [ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" - [ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@PLYMOUTH_LOGO_FILE@" -+[ -n "$PLYMOUTH_THEME_NAME" ] && THEME_OVERRIDE=1 - [ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme) - [ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@" - [ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@" -@@ -388,6 +389,12 @@ if [ -z "$PLYMOUTH_THEME_NAME" ]; then - exit 1 - fi - -+if [ $THEME_OVERRIDE ]; then -+ conf=$INITRDDIR/${PLYMOUTH_CONFDIR}/plymouthd.conf -+ echo "modifying plymouthd.conf: Theme=$PLYMOUTH_THEME_NAME" > /dev/stderr -+ sed -i "s/^ *Theme *=.*/# theme modified by plymouth-populate-initrd\nTheme=$PLYMOUTH_THEME_NAME/" $conf -+fi -+ - PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//') - - if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then --- -1.7.11.7 - diff --git a/plymouth.spec b/plymouth.spec index ba2211d..9d5b658 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -5,8 +5,8 @@ Summary: Graphical Boot Animation and Logger Name: plymouth -Version: 0.8.8 -Release: 6%{?dist} +Version: 0.8.9 +Release: 0.2013.03.26.0%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -31,9 +31,6 @@ Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2 Obsoletes: plymouth-gdm-hooks < 0.8.4-0.20101119.4 Obsoletes: plymouth-utils < 0.8.4-0.20101119.4 -Patch0: fix-crash.patch -Patch1: fix-fed-up.patch - %description Plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text @@ -241,8 +238,6 @@ Plymouth. It features a small spinner on a dark background. %prep %setup -q -%patch0 -p1 -b .fix-crash -%patch1 -p1 -b .fix-fed-up # Change the default theme sed -i -e 's/fade-in/charge/g' src/plymouthd.defaults @@ -499,6 +494,9 @@ fi %defattr(-, root, root) %changelog +* Tue Mar 26 2013 Ray Strode 0.8.9-0.2013.03.26.0 +- Update to snapshot to fix systemd vconsole issue + * Thu Feb 21 2013 Peter Robinson 0.8.8-6 - Merge newer F18 release into rawhide diff --git a/sources b/sources index 597a589..cefa061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38f5e613e5ab17806b950cee2d0d0d4e plymouth-0.8.8.tar.bz2 +568b3db40fbf85caf11eef5865abb770 plymouth-0.8.9.tar.bz2