From d135368530693d7c0b9f09044cd3129d48aaeeb13c01af1226951cb95229fc6d Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 26 Apr 2012 16:01:04 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=27 --- plymouth.changes | 8 ++++++++ plymouth.spec | 1 + suse-initrd-support | 47 +++++++++++++-------------------------------- 3 files changed, 22 insertions(+), 34 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 944877a..d3dabba 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Apr 26 15:57:56 UTC 2012 - tittiatcoke@gmail.com + +- Reduce the number of fonts that are included in the initrd. Also + let mkinitrd sort out the dependencies for the required libs. +- Use the same font as that grub2 is currently using for it's + graphics mode. + ------------------------------------------------------------------- Tue Apr 17 10:30:57 UTC 2012 - glin@suse.com diff --git a/plymouth.spec b/plymouth.spec index 2d8127c..daa6fd7 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -57,6 +57,7 @@ Requires: suspend >= 0.80.20100129.1 Requires: systemd-plymouth Provides: bootsplash = %{version} Obsoletes: bootsplash < %{version} +Requires: gnu-unifont-bitmap-fonts Requires(post): plymouth-scripts %description diff --git a/suse-initrd-support b/suse-initrd-support index a83f36a..8ac4f51 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -33,7 +33,7 @@ +plymouth show-splash --- /dev/null +++ new/scripts/setup-plymouth.sh.in 2012-04-03 11:11:44.656337240 +0200 -@@ -0,0 +1,68 @@ +@@ -0,0 +1,47 @@ +#!/bin/bash +# +#%stage: setup @@ -47,19 +47,24 @@ + +PLUGIN_PATH=$(plymouth --get-splash-plugin-path) + -+MODULE=$(grep "ModuleName *= *" @PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/${THEME}.plymouth | sed 's/ModuleName *= *//') ++MODULE=$(grep "ModuleName *= *" /usr/share/plymouth/themes/${THEME}/${THEME}.plymouth | sed 's/ModuleName *= *//') + +if [ ! -f "$PLUGIN_PATH/${MODULE}.so" ]; then + echo "The default plymouth plugin ($MODULE) doesn't exist." > /dev/stderr + exit 1 +fi + -+FILES="@PLYMOUTH_DATADIR@/plymouth/themes/text/text.plymouth \ -+ @PLYMOUTH_DATADIR@/plymouth/themes/details/details.plymouth \ -+ @PLYMOUTH_DATADIR@/plymouth/plymouthd.defaults \ -+ @PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/* \ -+ @PLYMOUTH_DATADIR@/plymouth/logo.png \ -+ /etc/plymouth/plymouthd.conf" ++FILES="/usr/share/plymouth/themes/text/text.plymouth \ ++ /usr/share/plymouth/themes/details/details.plymouth \ ++ /usr/share/plymouth/plymouthd.defaults \ ++ /usr/share/plymouth/themes/${THEME}/* \ ++ /usr/share/plymouth/logo.png \ ++ /etc/plymouth/plymouthd.conf \ ++ /usr/share/fonts/uni/unicode2.pf2 \ ++ /etc/fonts/fonts.conf \ ++ /etc/fonts/conf.d/69-unifont.conf \ ++ /etc/fonts/conf.avail/69-unifont.conf \ ++ /usr/lib/pango/1.6.0/modules/pango-basic-fc.so " + +PLUGINS="${PLUGIN_PATH}/details.so \ + ${PLUGIN_PATH}/text.so \ @@ -76,29 +81,3 @@ + mkdir -p $tmp_mnt/$(dirname $plugin) + cp_bin $plugin $tmp_mnt/$plugin +done -+ -+# copy files for font rendering -+_libdir=`rpm --eval '%{_lib}'` -+if [ "$_libdir" == "lib64" ]; -+ then -+ _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango64.modules" -+ else -+ _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango.modules" -+fi -+ -+FONTS="/usr/share/fonts/truetype/DejaVuSerif.ttf \ -+ /usr/share/fonts/truetype/DejaVuSans.ttf \ -+ /etc/fonts/fonts.conf \ -+ /etc/fonts/conf.d/60-latin.conf \ -+ ${_pangomod} \ -+ ${_pangodir}/pango-basic-fc.so \ -+ /usr/${_libdir}/libpango-1.0.so.0 \ -+ /usr/${_libdir}/libpangoft2-1.0.so.0 \ -+ /usr/${_libdir}/libpangocairo-1.0.so.0 " -+ -+for font in $FONTS; do -+ install -D $font $tmp_mnt/$font -+done -+mkdir -p $tmp_mnt/var/cache/fontconfig From 4cd5656d18b317cc0dbe9beb6c57cb1857e071b0b658d7e532f60309678c756b Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 26 Apr 2012 16:51:59 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=28 --- suse-initrd-support | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/suse-initrd-support b/suse-initrd-support index 8ac4f51..25e0dd4 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -60,11 +60,11 @@ + /usr/share/plymouth/themes/${THEME}/* \ + /usr/share/plymouth/logo.png \ + /etc/plymouth/plymouthd.conf \ -+ /usr/share/fonts/uni/unicode2.pf2 \ -+ /etc/fonts/fonts.conf \ -+ /etc/fonts/conf.d/69-unifont.conf \ -+ /etc/fonts/conf.avail/69-unifont.conf \ -+ /usr/lib/pango/1.6.0/modules/pango-basic-fc.so " ++ /usr/share/fonts/uni/unicode.pf2 \ ++ /etc/fonts/fonts.conf \ ++ /etc/fonts/conf.d/69-unifont.conf \ ++ /etc/fonts/conf.avail/69-unifont.conf \ ++ /usr/lib/pango/1.6.0/modules/pango-basic-fc.so " + +PLUGINS="${PLUGIN_PATH}/details.so \ + ${PLUGIN_PATH}/text.so \ From c96f83850abe5e8beaab77279a92bcaa126d48ab660d8649f83b50e55ff69009 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 27 Apr 2012 17:49:31 +0000 Subject: [PATCH 3/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=29 --- suse-initrd-support | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suse-initrd-support b/suse-initrd-support index 25e0dd4..6d0ed8f 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -60,7 +60,7 @@ + /usr/share/plymouth/themes/${THEME}/* \ + /usr/share/plymouth/logo.png \ + /etc/plymouth/plymouthd.conf \ -+ /usr/share/fonts/uni/unicode.pf2 \ ++ /usr/share/fonts/uni/unifont.pcf.gz \ + /etc/fonts/fonts.conf \ + /etc/fonts/conf.d/69-unifont.conf \ + /etc/fonts/conf.avail/69-unifont.conf \ From 682f8600b5583b7ece4eab4ffdd60c121fda344ac35952146340e2d5122dbcc4 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Fri, 27 Apr 2012 20:19:28 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=30 --- suse-initrd-support | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/suse-initrd-support b/suse-initrd-support index 6d0ed8f..bb93b6e 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -47,7 +47,7 @@ + +PLUGIN_PATH=$(plymouth --get-splash-plugin-path) + -+MODULE=$(grep "ModuleName *= *" /usr/share/plymouth/themes/${THEME}/${THEME}.plymouth | sed 's/ModuleName *= *//') ++MODULE=$(grep "ModuleName *= *" @PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/${THEME}.plymouth | sed 's/ModuleName *= *//') + +if [ ! -f "$PLUGIN_PATH/${MODULE}.so" ]; then + echo "The default plymouth plugin ($MODULE) doesn't exist." > /dev/stderr From f318e09d853d05af6ca8c41c6538cad2a8ad9ccbe9ffb3ea3993a88535e64e68 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 28 Apr 2012 07:01:46 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=31 --- plymouth.changes | 2 +- suse-initrd-support | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index d3dabba..6acb603 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Apr 26 15:57:56 UTC 2012 - tittiatcoke@gmail.com +Sat Apr 28 07:00:56 UTC 2012 - tittiatcoke@gmail.com - Reduce the number of fonts that are included in the initrd. Also let mkinitrd sort out the dependencies for the required libs. diff --git a/suse-initrd-support b/suse-initrd-support index bb93b6e..d8e9f92 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -33,7 +33,7 @@ +plymouth show-splash --- /dev/null +++ new/scripts/setup-plymouth.sh.in 2012-04-03 11:11:44.656337240 +0200 -@@ -0,0 +1,47 @@ +@@ -0,0 +1,59 @@ +#!/bin/bash +# +#%stage: setup @@ -81,3 +81,15 @@ + mkdir -p $tmp_mnt/$(dirname $plugin) + cp_bin $plugin $tmp_mnt/$plugin +done ++ ++_libdir=`rpm --eval '%{_lib}'` ++if [ "$_libdir" == "lib64" ]; ++ then ++ _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` ++ _pangomod="/etc/pango/pango64.modules" ++ else ++ _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` ++ _pangomod="/etc/pango/pango.modules" ++fi ++install -D ${_pangomod} $tmp_mnt/${_pangomod} ++mkdir -p $tmp_mnt/var/cache/fontconfig