From 50bb899c1208b579805c05cd49ae09e3d863bf9b8e90ca505255423d4bf4b809 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 11 Oct 2012 09:17:16 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=84 --- plymouth.changes | 11 +++++++++++ plymouth.spec | 1 - suse-initrd-support | 6 +++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index 05e2e45..26dab89 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 11 09:13:33 UTC 2012 - tittiatcoke@gmail.com + +- Fix the Pango installation within the initrd. This would + resolve the error message that Pango cannot find any fonts + +------------------------------------------------------------------- +Thu Sep 27 12:37:13 UTC 2012 - tittiatcoke@gmail.com + +- fix the libdir path in plymouth-set-default-theme (bnc#780085) + ------------------------------------------------------------------- Thu Sep 20 09:45:07 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 9a810df..a2a4e11 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -155,7 +155,6 @@ Requires: findutils Requires: gzip Requires: plymouth Requires(post): mkinitrd -BuildArch: noarch %description scripts This package contains scripts that help integrate Plymouth with diff --git a/suse-initrd-support b/suse-initrd-support index cdc6d3c..cb04ea1 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -117,17 +117,17 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in +done + +_libdir=`rpm --eval '%{_lib}'` ++mkdir -p $tmp_mnt/etc/pango +if [ "$_libdir" == "lib64" ]; + then + _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango64.modules" ++ pango-querymodules-64 > $tmp_mnt/etc/pango/pango.modules + pangobasicfc="${_pangodir}/pango-basic-fc.so" + else + _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` -+ _pangomod="/etc/pango/pango.modules" ++ pango-querymodules > $tmp_mnt/etc/pango/pango.modules + pangobasicfc="${_pangodir}/pango-basic-fc.so" +fi -+install -D ${_pangomod} $tmp_mnt/${_pangomod} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +mkdir -p $tmp_mnt/var/cache/fontconfig Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd From 4fbbb088a09eef13498caa59892f4621acbba799d1def72ed39dbbffe92b5972 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 11 Oct 2012 12:25:25 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=85 --- plymouth.changes | 6 ++++++ plymouth.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plymouth.changes b/plymouth.changes index 26dab89..a7192d6 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Oct 11 12:21:37 UTC 2012 - tittiatcoke@gmail.com + +- Temporarily disable the patch to remove the pid-file. This seems + to cause issues with the DM killing plymouth + ------------------------------------------------------------------- Thu Oct 11 09:13:33 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index a2a4e11..952023d 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -309,7 +309,7 @@ plugin. %patch7 -p1 %patch8 -p1 %patch10 -p1 -%patch11 -p1 +#patch11 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c From 7ff7a02b2dd9bcf80bec0758176224bcb6dc54718b770c1b18fc101e392792f9 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Thu, 11 Oct 2012 14:41:24 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=86 --- plymouth-remove-pid-file.patch | 4 ++-- plymouth.changes | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plymouth-remove-pid-file.patch b/plymouth-remove-pid-file.patch index 637fa09..bbdb2a3 100644 --- a/plymouth-remove-pid-file.patch +++ b/plymouth-remove-pid-file.patch @@ -28,8 +28,8 @@ Index: plymouth-0.8.6.1/src/main.c + ply_trace ("plymouthd is already running"); + + if (daemon_handle != NULL) -+ ply_detach_daemon (daemon_handle, EX_OK); -+ return EX_OK; ++ ply_detach_daemon (daemon_handle, EX_UNAVAILABLE); ++ return EX_UNAVAILABLE; + } + state.boot_buffer = ply_buffer_new (); diff --git a/plymouth.changes b/plymouth.changes index a7192d6..7a22a29 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Thu Oct 11 12:21:37 UTC 2012 - tittiatcoke@gmail.com -- Temporarily disable the patch to remove the pid-file. This seems - to cause issues with the DM killing plymouth +- Adjusted the upstream patch to remove the pid file. The original + one seems to cause issues with the DM killing plymouth ------------------------------------------------------------------- Thu Oct 11 09:13:33 UTC 2012 - tittiatcoke@gmail.com