From 152d46c65ed9f16bc8267c5197d769036784360fdc64411a7af9aa0dffb70d93 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 May 2012 11:26:08 +0000 Subject: [PATCH 1/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=38 --- plymouth.changes | 6 ++++++ plymouth.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/plymouth.changes b/plymouth.changes index e1ff63f..7e0950d 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 21 11:25:36 UTC 2012 - tittiatcoke@gmail.com + +- Update the installation/update from plymouth in a way that the + initrd file for the current running kernel is updated. + ------------------------------------------------------------------- Tue May 15 09:09:23 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 38b1548..f2f1b06 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -380,6 +380,7 @@ rm -rf %{buildroot} %post [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration +%{_libexecdir}/plymouth/plymouth-update-initrd if [ $1 -eq 1 ]; then if [ -f %{_sysconfdir}/default/grub ]; then sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub From a8dd40a2fefee8c37c7a0ab3b23cadaf0c94c458e6f6470d7e5492c5bb4c4cd7 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 May 2012 11:36:58 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=39 --- plymouth.changes | 2 ++ suse-initrd-support | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 7e0950d..9849bd7 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -3,6 +3,8 @@ Mon May 21 11:25:36 UTC 2012 - tittiatcoke@gmail.com - Update the installation/update from plymouth in a way that the initrd file for the current running kernel is updated. +- Corrected a typo with regards to the location of a pango module + when setting up the initrd. ------------------------------------------------------------------- Tue May 15 09:09:23 UTC 2012 - tittiatcoke@gmail.com diff --git a/suse-initrd-support b/suse-initrd-support index ad20771..841a341 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,59 @@ +@@ -0,0 +1,61 @@ +#!/bin/bash +# +#%stage: setup @@ -63,8 +63,7 @@ + /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 \ -+ /usr/lib/pango/1.6.0/modules/pango-basic-fc.so " ++ /etc/fonts/conf.avail/69-unifont.conf " + +PLUGINS="${PLUGIN_PATH}/details.so \ + ${PLUGIN_PATH}/text.so \ @@ -87,11 +86,14 @@ + then + _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` + _pangomod="/etc/pango/pango64.modules" ++ pango-basic-fc="/usr/lib64/pango/1.6.0/modules/pango-basic-fc.so" + else + _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` + _pangomod="/etc/pango/pango.modules" ++ pango-basic-fc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so" +fi +install -D ${_pangomod} $tmp_mnt/${_pangomod} ++install -D ${pango-basic-fc} $tmp_mnt/${pango-basic-fc} +mkdir -p $tmp_mnt/var/cache/fontconfig --- plymouth-0.8.4/scripts/plymouth-update-initrd 2008-12-19 05:36:55.000000000 +0100 +++ new/scripts/plymouth-update-initrd 2012-05-15 10:59:08.158501726 +0200 From 72dca5e6e649c6d6c136b1f0671d25c513ee61d4480afadbb724f067a1199415 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 May 2012 12:52:34 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=40 --- plymouth.spec | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/plymouth.spec b/plymouth.spec index f2f1b06..8fcf365 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -59,6 +59,7 @@ Provides: bootsplash = %{version} Obsoletes: bootsplash < %{version} Requires: gnu-unifont-bitmap-fonts Requires(post): plymouth-scripts +Requires(post): mkinitrd %description Plymouth provides an attractive graphical boot animation in @@ -139,8 +140,8 @@ Requires: coreutils Requires: cpio Requires: findutils Requires: gzip -Requires: mkinitrd Requires: plymouth +Requires(post): mkinitrd BuildArch: noarch %description scripts @@ -379,15 +380,17 @@ popd rm -rf %{buildroot} %post -[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration -%{_libexecdir}/plymouth/plymouth-update-initrd -if [ $1 -eq 1 ]; then - if [ -f %{_sysconfdir}/default/grub ]; then - sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub - grub2-mkconfig -o /boot/grub2/grub.cfg - fi - if [ -f /boot/grub/menu.lst ]; then - sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst +if [ ! -e /.buildenv ]; then + [ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration + %{_libexecdir}/plymouth/plymouth-update-initrd + if [ $1 -eq 1 ]; then + if [ -f %{_sysconfdir}/default/grub ]; then + sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub + grub2-mkconfig -o /boot/grub2/grub.cfg + fi + if [ -f /boot/grub/menu.lst ]; then + sed -i 's|splash=silent|splash|g' /boot/grub/menu.lst + fi fi fi @@ -420,7 +423,7 @@ fi %postun -n libply2 -p /sbin/ldconfig %post theme-spinfinity -if [ $1 -eq 1 ]; then +if [ $1 -eq 1 -a ! -e /.buildenv ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then %{_sbindir}/plymouth-set-default-theme -R spinfinity @@ -436,7 +439,7 @@ if [ $1 -eq 0 ]; then fi %post theme-fade-in -if [ $1 -eq 1 ]; then +if [ $1 -eq 1 -a ! -e /.buildenv ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then %{_sbindir}/plymouth-set-default-theme -R fade-in @@ -452,7 +455,7 @@ if [ $1 -eq 0 ]; then fi %post theme-solar -if [ $1 -eq 1 ]; then +if [ $1 -eq 1 -a ! -e /.buildenv ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then %{_sbindir}/plymouth-set-default-theme -R solar @@ -468,7 +471,7 @@ if [ $1 -eq 0 ]; then fi %post branding-openSUSE -if [ $1 -eq 1 ]; then +if [ $1 -eq 1 -a ! -e /.buildenv ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then %{_sbindir}/plymouth-set-default-theme -R openSUSE From 97db882d53c3efd8f603261449bf68cad8b25b6598f1f6cf26e4c7fed786eed3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 21 May 2012 14:39:30 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=41 --- suse-initrd-support | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/suse-initrd-support b/suse-initrd-support index 841a341..8ab18ba 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -86,14 +86,14 @@ + then + _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` + _pangomod="/etc/pango/pango64.modules" -+ pango-basic-fc="/usr/lib64/pango/1.6.0/modules/pango-basic-fc.so" ++ pangobasicfc="/usr/lib64/pango/1.6.0/modules/pango-basic-fc.so" + else + _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` + _pangomod="/etc/pango/pango.modules" -+ pango-basic-fc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so" ++ pangobasicfc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so" +fi +install -D ${_pangomod} $tmp_mnt/${_pangomod} -+install -D ${pango-basic-fc} $tmp_mnt/${pango-basic-fc} ++install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +mkdir -p $tmp_mnt/var/cache/fontconfig --- plymouth-0.8.4/scripts/plymouth-update-initrd 2008-12-19 05:36:55.000000000 +0100 +++ new/scripts/plymouth-update-initrd 2012-05-15 10:59:08.158501726 +0200