rpm/plymouth
SHA256
1
0
Fork 0
forked from pool/plymouth
Code Pull Requests Activity

Accepting request 137860 from Base:System

Browse Source 
Update to plymouth to resolve two issues. First one is regarding pango reporting in the initrd that it can not find fonts and the second one to prevent issues with the DM not able to detect/kill plymouth

OBS-URL: https://build.opensuse.org/request/show/137860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2012-10-12 12:21:04 +00:00 committed by Git OBS Bridge
commit 40063d2af7
4 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plymouth-remove-pid-file.patch
View File

@ -28,8 +28,8 @@ Index: plymouth-0.8.6.1/src/main.c
+ ply_trace ("plymouthd is already running"); + ply_trace ("plymouthd is already running");
+ +
+ if (daemon_handle != NULL) + if (daemon_handle != NULL)
+ ply_detach_daemon (daemon_handle, EX_OK); + ply_detach_daemon (daemon_handle, EX_UNAVAILABLE);
+ return EX_OK; + return EX_UNAVAILABLE;
+ } + }
+ +
state.boot_buffer = ply_buffer_new (); state.boot_buffer = ply_buffer_new ();

17
plymouth.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Thu Oct 11 12:21:37 UTC 2012 - tittiatcoke@gmail.com
- 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
- 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 Thu Sep 20 09:45:07 UTC 2012 - tittiatcoke@gmail.com

3
plymouth.spec
View File

@ -155,7 +155,6 @@ Requires: findutils
Requires: gzip Requires: gzip
Requires: plymouth Requires: plymouth
Requires(post): mkinitrd Requires(post): mkinitrd
BuildArch: noarch
%description scripts %description scripts
This package contains scripts that help integrate Plymouth with This package contains scripts that help integrate Plymouth with
@ -310,7 +309,7 @@ plugin.
%patch7 -p1 %patch7 -p1
%patch8 -p1 %patch8 -p1
%patch10 -p1 %patch10 -p1
%patch11 -p1 #patch11 -p1
# replace builddate with patch0date # replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c

6
suse-initrd-support
View File

@ -117,17 +117,17 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in
+done +done
+ +
+_libdir=`rpm --eval '%{_lib}'` +_libdir=`rpm --eval '%{_lib}'`
+mkdir -p $tmp_mnt/etc/pango
+if [ "$_libdir" == "lib64" ]; +if [ "$_libdir" == "lib64" ];
+ then + then
+ _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'` + _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" + pangobasicfc="${_pangodir}/pango-basic-fc.so"
+ else + else
+ _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'` + _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" + pangobasicfc="${_pangodir}/pango-basic-fc.so"
+fi +fi
+install -D ${_pangomod} $tmp_mnt/${_pangomod}
+install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}
+mkdir -p $tmp_mnt/var/cache/fontconfig +mkdir -p $tmp_mnt/var/cache/fontconfig
Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd Index: plymouth-0.8.6.1/scripts/plymouth-update-initrd