retitle 670197 plymouth: Please upgrade to plymouth 0.8.5.1 thanks Hello!
I've updated the plymouth package to 0.8.5.1 on my own and incorporated alot of the fixes suggested in the debian bug reports for plymouth. The remaining (and most important) fix still needed is for #629416 .... Here's what I've done: cd /tmp apt-get source plymouth wget http://www.freedesktop.org/software/plymouth/releases/plymouth-0.8.5.1.tar.bz2 cd plymouth-0.8.3 uupdate -u ../plymouth-0.8.5.1.tar.bz2 cd ../plymouth-0.8.5.1 Then I've tracked the rest of my changes in git, so they can be more easily reviewed... see attached patch series for changes made so far! Any comments would be greatly appreciated and some input on preferred alternative for solution of #629416 lovely! -- Andreas Henriksson
>From c138058d196a7344d283830cb7abbfbaf06a47b0 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 17:51:18 +0200 Subject: [PATCH 01/10] Use /etc/os-release as release file base-files (since 6.8) ships a unified /etc/os-release file. This file is supported in new upstream plymouth release (see upstream commit "text-progress-bar: Add support for /etc/os-release" aefa84dc9e5b6ece4550ce40fd8b5969e056959f) If we use that one instead of /etc/debian_version then we can drop our 01-parse-etc-debian_version.patch (which no longer apply). --- debian/local/plymouth.hook | 2 +- debian/patches/01-parse-etc-debian_version.patch | 23 ---------------------- debian/patches/series | 1 - debian/rules | 2 +- 4 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 debian/patches/01-parse-etc-debian_version.patch diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook index 6239068..ffe858a 100644 --- a/debian/local/plymouth.hook +++ b/debian/local/plymouth.hook @@ -64,7 +64,7 @@ done # copy base themes and logo cp -a "${THEMES}/details" "${DESTDIR}/${THEMES}" cp -a "${THEMES}/text" "${DESTDIR}/${THEMES}" -cp /etc/debian_version "${DESTDIR}/etc" +cp /etc/os-release "${DESTDIR}/etc" case "$(basename ${THEME} .plymouth)" in text) diff --git a/debian/patches/01-parse-etc-debian_version.patch b/debian/patches/01-parse-etc-debian_version.patch deleted file mode 100644 index 4bc09ff..0000000 --- a/debian/patches/01-parse-etc-debian_version.patch +++ /dev/null @@ -1,23 +0,0 @@ -Author: Guido Guenther <[email protected]> -Description: Parse /etc/debian_version (Closes: #573602). - -diff -Naurp plymouth.orig/src/libply-splash-core/ply-text-progress-bar.c plymouth/src/libply-splash-core/ply-text-progress-bar.c ---- plymouth.orig/src/libply-splash-core/ply-text-progress-bar.c 2010-01-02 11:22:54.000000000 +0100 -+++ plymouth/src/libply-splash-core/ply-text-progress-bar.c 2010-03-14 16:57:16.000000000 +0100 -@@ -109,15 +109,7 @@ get_os_string (void) - read(fd, buf, sbuf.st_size); - close(fd); - -- pos = strstr(buf, " release "); -- if (!pos) goto out; -- pos2 = strstr(pos, " ("); -- if (!pos2) goto out; -- *pos = '\0'; -- pos+= 9; -- *pos2 = '\0'; -- asprintf(&os_string," %s %s", buf, pos); --out: -+ asprintf(&os_string," Debian %s", buf); - free(buf); - } - diff --git a/debian/patches/series b/debian/patches/series index d58338b..7881d6d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -01-parse-etc-debian_version.patch 02-set-default-framebuffer-device-to-dev-fb0.patch 03-awk.patch 04-stderr.patch diff --git a/debian/rules b/debian/rules index 05477b6..31e4a8c 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ override_dh_auto_configure: --enable-tracing --disable-tests --disable-gdm-transition \ --with-system-root-install --without-rhgb-compat-link \ --with-gdm-autostart-file \ - --with-release-file=/etc/debian_version \ + --with-release-file=/etc/os-release \ --with-logo=/usr/share/plymouth/debian-logo.png \ --with-background-color=0x005a8a -- 1.7.10
>From 77225f3b8cc9ed03e3bafe39ec07ec1733e2de2e Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 17:58:27 +0200 Subject: [PATCH 02/10] Drop framebuffer device (fb->fb0) patch, fixed upstream. see upstream commit "frame-buffer: use /dev/fb0 as default device" b840b6f73c6ad0c79961b75684183f1eb9728cd7 --- ...02-set-default-framebuffer-device-to-dev-fb0.patch | 17 ----------------- debian/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 debian/patches/02-set-default-framebuffer-device-to-dev-fb0.patch diff --git a/debian/patches/02-set-default-framebuffer-device-to-dev-fb0.patch b/debian/patches/02-set-default-framebuffer-device-to-dev-fb0.patch deleted file mode 100644 index 2d315ab..0000000 --- a/debian/patches/02-set-default-framebuffer-device-to-dev-fb0.patch +++ /dev/null @@ -1,17 +0,0 @@ -Author: Guido Guenther <[email protected]> -Description: - Set default framebuffer device to /dev/fb0 instead of /dev/fb which doesn't - exist by default (Closes: #573724). - -diff -Naurp plymouth.orig//src/plugins/renderers/frame-buffer/plugin.c plymouth/src/plugins/renderers/frame-buffer/plugin.c ---- plymouth.orig//src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:22:53.066407620 +0100 -+++ plymouth/src/plugins/renderers/frame-buffer/plugin.c 2010-11-20 16:23:21.861484753 +0100 -@@ -56,7 +56,7 @@ - #include "ply-renderer-plugin.h" - - #ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME --#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb" -+#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0" - #endif - - struct _ply_renderer_head diff --git a/debian/patches/series b/debian/patches/series index 7881d6d..da23ac6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -02-set-default-framebuffer-device-to-dev-fb0.patch 03-awk.patch 04-stderr.patch 05-default-theme.patch -- 1.7.10
>From 3b0e11bb09bae53c665bc934b9badd11489e8283 Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 18:08:04 +0200 Subject: [PATCH 03/10] Drop backported patch to avoid stomping on tty lock settings Now included in current release. Upstream commit id 8c390bea97ccd2c0f74f63fd90d549dd4f488651 --- debian/patches/06-tty.patch | 18 ------------------ debian/patches/series | 1 - 2 files changed, 19 deletions(-) delete mode 100644 debian/patches/06-tty.patch diff --git a/debian/patches/06-tty.patch b/debian/patches/06-tty.patch deleted file mode 100644 index 283a2bb..0000000 --- a/debian/patches/06-tty.patch +++ /dev/null @@ -1,18 +0,0 @@ -Author: Julien Cristau <[email protected]> -Description: - Cherry-pick "[terminal] don't stomp over original tty lock settings". Prevents - setting tty1 in 'echo' mode after boot (Closes: 595178). - -diff -Naurp plymouth.orig/src/libply-splash-core/ply-terminal.c plymouth/src/libply-splash-core/ply-terminal.c ---- plymouth.orig/src/libply-splash-core/ply-terminal.c 2010-09-14 21:16:57.185256706 +0200 -+++ plymouth/src/libply-splash-core/ply-terminal.c 2010-10-13 17:58:48.752970212 +0200 -@@ -188,7 +188,8 @@ ply_terminal_set_unbuffered_input (ply_t - if (tcsetattr (terminal->fd, TCSANOW, &term_attributes) != 0) - return false; - -- if (ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0) -+ if (!terminal->original_locked_term_attributes_saved && -+ ioctl (terminal->fd, TIOCGLCKTRMIOS, &locked_term_attributes) == 0) - { - terminal->original_locked_term_attributes = locked_term_attributes; - terminal->original_locked_term_attributes_saved = true; diff --git a/debian/patches/series b/debian/patches/series index da23ac6..d391167 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,4 @@ 03-awk.patch 04-stderr.patch 05-default-theme.patch -06-tty.patch 07-return-code.patch -- 1.7.10
>From 0f42193a3c994273e1a42283c11a6a8d61e6a67f Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 18:14:57 +0200 Subject: [PATCH 04/10] Refresh "stderr" and "return-code" patches to apply cleanly --- debian/patches/04-stderr.patch | 24 +++++++++++------------- debian/patches/07-return-code.patch | 9 ++++----- 2 files changed, 15 insertions(+), 18 deletions(-) diff --git a/debian/patches/04-stderr.patch b/debian/patches/04-stderr.patch index 0dafcc1..c22cfa8 100644 --- a/debian/patches/04-stderr.patch +++ b/debian/patches/04-stderr.patch @@ -3,10 +3,9 @@ Description: Use fd for stdout instead of device, since the latter may not always exist, e.g. in chroots (Closes: #581649). -diff -Naurp plymouth.orig/scripts/plymouth-populate-initrd.in plymouth/scripts/plymouth-populate-initrd.in ---- plymouth.orig/scripts/plymouth-populate-initrd.in 2010-05-14 19:22:15.000000000 +0200 -+++ plymouth/scripts/plymouth-populate-initrd.in 2010-05-14 19:23:25.000000000 +0200 -@@ -38,7 +38,7 @@ function usage() { +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -338,7 +338,7 @@ local output="/dev/stdout" local rc=0 if [ "$1" == "error" ]; then @@ -15,7 +14,7 @@ diff -Naurp plymouth.orig/scripts/plymouth-populate-initrd.in plymouth/scripts/p rc=1 fi -@@ -84,14 +84,14 @@ inst ${PLYMOUTH_POLICYDIR}/plymouthd.def +@@ -383,14 +383,14 @@ inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR if [ -z "$PLYMOUTH_THEME_NAME" ]; then @@ -32,10 +31,9 @@ diff -Naurp plymouth.orig/scripts/plymouth-populate-initrd.in plymouth/scripts/p exit 1 fi -diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts/plymouth-set-default-theme.in ---- plymouth.orig/scripts/plymouth-set-default-theme.in 2010-05-14 19:22:15.000000000 +0200 -+++ plymouth/scripts/plymouth-set-default-theme.in 2010-05-14 19:23:04.000000000 +0200 -@@ -79,14 +79,14 @@ while [ $# -gt 0 ]; do +--- a/scripts/plymouth-set-default-theme.in ++++ b/scripts/plymouth-set-default-theme.in +@@ -76,14 +76,14 @@ -l|--list) if [ -n "$THEME_NAME" ]; then @@ -54,7 +52,7 @@ diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts exit 1 fi -@@ -99,14 +99,14 @@ while [ $# -gt 0 ]; do +@@ -96,14 +96,14 @@ -r|--reset|default) if [ -n "$THEME_NAME" ]; then @@ -73,7 +71,7 @@ diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts exit 1 fi -@@ -119,20 +119,20 @@ while [ $# -gt 0 ]; do +@@ -116,20 +116,20 @@ *) if [ -n "$THEME_NAME" ]; then @@ -100,7 +98,7 @@ diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts exit 1 fi -@@ -158,7 +158,7 @@ if [ $DO_RESET -eq 0 ] && [ $DO_INITRD_R +@@ -155,7 +155,7 @@ fi if [ `id -u` -ne 0 ]; then @@ -109,7 +107,7 @@ diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts exit 1 fi -@@ -169,14 +169,14 @@ if [ $DO_RESET -ne 0 ]; then +@@ -166,14 +166,14 @@ fi if [ ! -e ${PLYMOUTH_DATADIR}/plymouth/themes/${THEME_NAME}/${THEME_NAME}.plymouth ]; then diff --git a/debian/patches/07-return-code.patch b/debian/patches/07-return-code.patch index db2594b..a3421c7 100644 --- a/debian/patches/07-return-code.patch +++ b/debian/patches/07-return-code.patch @@ -1,10 +1,9 @@ Author: Michael Prokop <[email protected]> Description: Fixing wrong return code of plymouth-set-default-theme (Closes: #605018). -diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts/plymouth-set-default-theme.in ---- plymouth.orig/scripts/plymouth-set-default-theme.in 2011-09-08 15:03:24.212396867 +0200 -+++ plymouth/scripts/plymouth-set-default-theme.in 2011-09-08 15:04:41.011888522 +0200 -@@ -179,5 +179,7 @@ grep -q '^[[]Daemon[]]' ${PLYMOUTH_CONFD +--- a/scripts/plymouth-set-default-theme.in ++++ b/scripts/plymouth-set-default-theme.in +@@ -184,5 +184,7 @@ sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf @@ -12,4 +11,4 @@ diff -Naurp plymouth.orig/scripts/plymouth-set-default-theme.in plymouth/scripts +if [ $DO_INITRD_REBUILD -ne 0 ] ; then + (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd) +fi - + exit 0 -- 1.7.10
>From 85e0ad0e0aa5c3c5420bda558f0ce0d9dc6ac1ab Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Mon, 11 Jun 2012 18:53:18 +0200 Subject: [PATCH 05/10] Create pid file /run/plymouth/pid systemd has native unit files for plymouth. The unit plymouth-start.service starts plymouthd, if no initramfs is used. Thus it shouldn't run if plymouthd has been started in the initramfs. To do that, the unit file contains a check: === ConditionPathExists=!/run/plymouth/pid === The attached patch adds the equivalent to the plymouth pre-mount script. Closes: #659438 --- debian/local/plymouth.init-premount | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/local/plymouth.init-premount b/debian/local/plymouth.init-premount index b1566a8..3708bbf 100644 --- a/debian/local/plymouth.init-premount +++ b/debian/local/plymouth.init-premount @@ -34,6 +34,7 @@ then modprobe i8042 modprobe atkbd - /sbin/plymouthd --mode=boot --attach-to-session + mkdir -m 0755 /run/plymouth + /sbin/plymouthd --mode=boot --attach-to-session --pid-file=/run/plymouth/pid /bin/plymouth --show-splash fi -- 1.7.10
>From 206e7f02c79bbb6bb7ea52f234db45de1192fb2f Mon Sep 17 00:00:00 2001 From: Michael Biebl <[email protected]> Date: Mon, 11 Jun 2012 18:58:20 +0200 Subject: [PATCH 06/10] Don't try to load non-existing modules i8042.ko and atkbd.ko /usr/share/initramfs-tools/scripts/init-premount/plymouth contains modprobe i8042 modprobe atkbd But as you can see, I'm running the latest Debian kernel, and I get: root@pluto:~# modinfo i8042 ERROR: modinfo: could not find module i8042 root@pluto:~# modinfo atkbd ERROR: modinfo: could not find module atkbd This leads to unpleasant error messages from modprobe during boot. Please consider removing those modules from the initramfs script. Closes: #659436 --- debian/local/plymouth.init-premount | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/local/plymouth.init-premount b/debian/local/plymouth.init-premount index 3708bbf..6e1dfd3 100644 --- a/debian/local/plymouth.init-premount +++ b/debian/local/plymouth.init-premount @@ -31,9 +31,6 @@ done if [ "${SPLASH}" = "true" ] then - modprobe i8042 - modprobe atkbd - mkdir -m 0755 /run/plymouth /sbin/plymouthd --mode=boot --attach-to-session --pid-file=/run/plymouth/pid /bin/plymouth --show-splash -- 1.7.10
>From 01dd359956c46059810740a595e42178581dd1eb Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 19:10:03 +0200 Subject: [PATCH 07/10] Use $x-display-manager in LSB header of init script The previous list was missing atleast lightdm. Thanks: Julien Cristau for suggesting the solution Closes: #669032 --- debian/plymouth.init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/plymouth.init b/debian/plymouth.init index 9c5a346..adc3c5f 100644 --- a/debian/plymouth.init +++ b/debian/plymouth.init @@ -4,8 +4,8 @@ # Provides: plymouth # Required-Start: udev $remote_fs $all # Required-Stop: $remote_fs -# Should-Start: gdm gdm3 kdm xdm slim nodm -# Should-Stop: gdm gdm3 kdm xdm slim nodm +# Should-Start: $x-display-manager +# Should-Stop: $x-display-manager # Default-Start: 2 3 4 5 # Default-Stop: 0 6 # Short-Description: Stop plymouth during boot and start it on shutdown -- 1.7.10
>From 44130486a54457c835b29e6ab21fe9519e2d108f Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 19:42:15 +0200 Subject: [PATCH 08/10] Add --enable-log-viewer configure flag to continue building it See upstream commit http://cgit.freedesktop.org/plymouth/commit/configure.ac?id=34c6f34c6d53ec0e2dc58fabfcf412d34709605b for reasoning on why it's no longer built by default. --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 31e4a8c..92d238d 100755 --- a/debian/rules +++ b/debian/rules @@ -17,6 +17,7 @@ override_dh_auto_configure: dh_auto_configure -- --prefix=/usr --localstatedir=/var --enable-pango \ --enable-tracing --disable-tests --disable-gdm-transition \ --with-system-root-install --without-rhgb-compat-link \ + --with-log-viewer \ --with-gdm-autostart-file \ --with-release-file=/etc/os-release \ --with-logo=/usr/share/plymouth/debian-logo.png \ -- 1.7.10
>From ea375b2ffd2e755a04fda3ff9a7342dbbe5177ca Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 19:52:02 +0200 Subject: [PATCH 09/10] Add new plymouth-themes-spinner package --- debian/control | 15 ++++++++++++++- debian/plymouth-themes-spinner.install | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 debian/plymouth-themes-spinner.install diff --git a/debian/control b/debian/control index e1a8305..43aa18f 100644 --- a/debian/control +++ b/debian/control @@ -61,7 +61,8 @@ Package: plymouth-themes-all Architecture: all Depends: ${misc:Depends}, plymouth-themes-fade-in, plymouth-themes-glow, - plymouth-themes-script, plymouth-themes-solar, plymouth-themes-spinfinity + plymouth-themes-script, plymouth-themes-solar, plymouth-themes-spinfinity, + plymouth-themes-spinner Description: Graphical Boot Animation and Logger (themes metapackage) Plymouth provides an attractive boot animation in place of the text messages that normally get shown. Text messages are instead redirected to a logfile for @@ -127,3 +128,15 @@ Description: Graphical Boot Animation and Logger (spinfinity theme) . This package contains the spinfinity theme. It features a centered logo and animated spinner that spins in the shape of an infinity sign. + +Package: plymouth-themes-spinner +Architecture: all +Depends: ${misc:Depends}, plymouth-drm (>= ${source:Version}) +Provides: plymouth-theme +Description: Graphical Boot Animation and Logger (spinner theme) + Plymouth provides an attractive boot animation in place of the text messages + that normally get shown. Text messages are instead redirected to a logfile for + viewing after boot. + . + This package contains the spinner theme. It features a very simple theme + with a small spinner on a dark background. diff --git a/debian/plymouth-themes-spinner.install b/debian/plymouth-themes-spinner.install new file mode 100644 index 0000000..938b70c --- /dev/null +++ b/debian/plymouth-themes-spinner.install @@ -0,0 +1 @@ +/usr/share/plymouth/themes/spinner -- 1.7.10
>From b1b740097e7ee09dab3090d9c8e012b517a74aab Mon Sep 17 00:00:00 2001 From: Andreas Henriksson <[email protected]> Date: Mon, 11 Jun 2012 18:17:17 +0200 Subject: [PATCH 10/10] Update debian/changelog --- debian/changelog | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 19fabec..26e316c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,27 @@ plymouth (0.8.5.1-0.1) UNRELEASED; urgency=low - * New upstream release + [ Andreas Henriksson ] + * New upstream release(s) (Closes: #670197), relevant fixes included: + - "drm: reduce minimum build requirements" (Closes: #611593) + - generally improved systemd support (Closes: #596680) + - "client: add new flush api" (Closes: #673501) + - "set-default-theme: redirect to /dev/null not /null" (Closes: #609207) + * Use /etc/os-release as release file + - thus also drop the patch for /etc/debian_version handling. + * Drop framebuffer device (fb->fb0) patch, fixed upstream. + * Drop backported patch to avoid stomping on tty lock settings + * Refresh "stderr" and "return-code" patches to apply cleanly + + [ Michael Biebl ] + * Create pid file /run/plymouth/pid (Closes: #659438) + * Don't try to load non-existing modules i8042.ko and atkbd.ko + (Closes: #659436) + + [ Andreas Henriksson ] + * Use $x-display-manager in LSB header of init script (Closes: #669032) + Thanks to Julien Cristau for suggesting the solution + * Add --enable-log-viewer configure flag to continue building it + * Add new plymouth-themes-spinner package -- Andreas Henriksson <[email protected]> Mon, 11 Jun 2012 17:35:28 +0200 -- 1.7.10
