Hi,
On Sat, Mar 27, 2010 at 07:14:35PM +0100, Guido Günther wrote:
> On Sat, Mar 27, 2010 at 07:02:29PM +0100, Guido Günther wrote:
> > On Sat, Mar 27, 2010 at 05:25:31PM +0100, Guido Günther wrote:
> > > Hi Daniel,
> > > On Sat, Mar 27, 2010 at 04:27:55PM +0100, Daniel Baumann wrote:
> > > > On 03/27/2010 03:42 PM, Guido Günther wrote:
> > > > >>thanks, applied. i'm wondering if you don't have a git tree online,
> > > > >>so i could merge directly. anyhow, thanks a lot.
> > > > >I can arrange for that.
> > > >
> > > > i'm fine applying patches by hand, however, it would be a bit
> > > > faster, and you wouldn't need to go through the overhead of writing
> > > > bugs all the time.
> > > >
> > > > >Hmm...I don't see much value in splitting these out. That's why I
> > > > >introducted the x11 package, we can keep the x11 stuff there: the
> > > > >renderer as well as the log reader.
> > > >
> > > > ack.
> > > >
> > > > fyi, have uploaded 0.7.2-6 to unstable (which will appear once
> > > > ftp-master is back), and 0.8.0 to experimental (which has to go
> > > > through NEW).
> > > Great. 0.8.0 needs some more work though. The attached patch adds the
> > > missing config files and also removes /usr/bin/* from plymouth so the
> > > log viewer doesn't end up in two packages. We still segfault with the
> > > x11 and drm backend though (the later looking for noveau symbols). I'll
> > > fix that up as soon as I find the time.
> > Attached patch fixes the undefined reference to the disabled noveau
> > renderer so we don't crash.
> Just for completeness: with the last two patches I get a working
> bootsplash when invoking plymouth manually. This leaves the initramfs to
> be fixed.
Attached patch fixes the initramfs generation for 0.8.0. Please apply.
-- Guido
>From f67c63461f2e087a6744e6b5ee1edd0f3e6e0583 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
Date: Sun, 28 Mar 2010 16:10:14 +0200
Subject: [PATCH] Update initramfs hook for 0.8.0
---
debian/local/plymouth.hook | 46 +++++++++++++++++++++++++++----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/debian/local/plymouth.hook b/debian/local/plymouth.hook
index 4cbd1a5..55498b7 100644
--- a/debian/local/plymouth.hook
+++ b/debian/local/plymouth.hook
@@ -18,41 +18,44 @@ esac
. /usr/share/initramfs-tools/hook-functions
+THEME="$(/usr/sbin/plymouth-set-default-theme || true)"
THEMES="/usr/share/plymouth/themes"
-DEFAULT="${THEMES}/default.plymouth"
-
-if [ ! -r "${DEFAULT}" ]
+if [ -n "${THEME}" ]
then
+ THEME="${THEMES}/${THEME}/${THEME}.plymouth"
+else
exit 0
fi
-THEME="${THEMES}/$(readlink ${DEFAULT})"
-
-IMAGES="$(sed -n 's/^ImageDir=\(.*\)/\1/p' ${THEME})"
-MODULE="/usr/lib/plymouth/$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME}).so"
-
-copy_exec ${MODULE}
-copy_exec /bin/plymouth
-copy_exec /sbin/plymouthd
-copy_exec /usr/lib/plymouth/details.so
-copy_exec /usr/lib/plymouth/text.so
-copy_exec /usr/lib/plymouth/label.so
+PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+PLUGINS="details.so text.so label.so"
+MODULE="${PLUGIN_PATH}/$(sed -n 's/^ModuleName=\(.*\)/\1/p' ${THEME}).so"
+# copy plugin and images for current theme
+copy_exec "${MODULE}"
mkdir -p "${DESTDIR}/${THEMES}"
-
+IMAGES="$(sed -n 's/^ImageDir=\(.*\)/\1/p' ${THEME})"
# No images in text mode:
if [ -n "${IMAGES}" ]
then
cp -r "${IMAGES}" "${DESTDIR}/${THEMES}"
fi
-cp -rL "${DEFAULT}" "${DESTDIR}/${THEMES}"
+# copy binaries and base plugins
+copy_exec /bin/plymouth
+copy_exec /sbin/plymouthd
+for PLUGIN in ${PLUGINS}; do
+ copy_exec ${PLUGIN_PATH}/${PLUGIN}
+done
+
+# copy base themes and logo
cp -a "${THEMES}/details" "${DESTDIR}/${THEMES}"
cp -a "${THEMES}/text" "${DESTDIR}/${THEMES}"
+cp -L "${THEMES}/default.plymouth" "${DESTDIR}/${THEMES}"
cp /etc/debian_version "${DESTDIR}/etc"
cp /usr/share/plymouth/debian-logo.png "${DESTDIR}/usr/share/plymouth"
-# font rendering
+# copy files for font rendering
mkdir -p "${DESTDIR}/usr/share/fonts/truetype/ttf-dejavu"
mkdir -p "${DESTDIR}/usr/lib/pango/1.6.0/modules"
mkdir -p "${DESTDIR}/etc/fonts/conf.d"
@@ -66,3 +69,12 @@ copy_exec /usr/lib/pango/1.6.0/module-files.d/libpango1.0-0.modules
copy_exec /usr/lib/libpango-1.0.so.0
copy_exec /usr/lib/libpangoft2-1.0.so.0
copy_exec /usr/lib/libpangocairo-1.0.so.0
+
+# copy config files
+mkdir -p "${DESTDIR}/etc/plymouth"
+cp -a /etc/plymouth/plymouthd.conf "${DESTDIR}/etc/plymouth/"
+cp -a /usr/share/plymouth/plymouthd.defaults "${DESTDIR}/usr/share/plymouth/"
+
+# copy renderers
+copy_exec /usr/lib/plymouth/renderers/frame-buffer.so
+copy_exec /usr/lib/plymouth/renderers/drm.so
--
1.7.0.3
