pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 131391 from Base:System

Browse Source 
- Add plymouth-after-udev-settle.patch: ensure plymouth is started
  after udev triggers has been started (git + name change due to
  systemd < 183 in openSUSE 12.2). (forwarded request 131368 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/131391
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=22
This commit is contained in:
Ismail Dönmez 2012-08-26 09:33:36 +00:00 committed by Git OBS Bridge
commit 366668335a
4 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plymouth-after-udev-settle.patch Normal file
View File

@ -0,0 +1,13 @@
Index: plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
===================================================================
--- plymouth-0.8.6.1.orig/systemd-units/plymouth-start.service.in
+++ plymouth-0.8.6.1/systemd-units/plymouth-start.service.in
@@ -2,7 +2,7 @@
Description=Show Plymouth Boot Screen
DefaultDependencies=no
Wants=systemd-ask-password-plymouth.path
-After=systemd-vconsole-setup.service systemd-udev-settle.service
+After=systemd-vconsole-setup.service udev-trigger.service
Before=systemd-ask-password-plymouth.service
ConditionKernelCommandLine=!plymouth.enable=0
ConditionPathExists=!@plymouthruntimedir@/pid

13
plymouth.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Aug 22 14:04:13 UTC 2012 - fcrozat@suse.com
- Add plymouth-after-udev-settle.patch: ensure plymouth is started
after udev triggers has been started (git + name change due to
systemd < 183 in openSUSE 12.2).
-------------------------------------------------------------------
Wed Aug 22 11:41:57 UTC 2012 - tittiatcoke@gmail.com
- Ensure that the right Pango version is used for copying one of
the pango modules
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 8 09:03:58 UTC 2012 - fcrozat@suse.com Wed Aug 8 09:03:58 UTC 2012 - fcrozat@suse.com

3
plymouth.spec
View File

@ -52,6 +52,8 @@ Patch9: 0001-ply-text-progress-bar-strip-quotes-if-present.patch
Patch10: 0001-Some-greenish-openSUSE-colors.patch Patch10: 0001-Some-greenish-openSUSE-colors.patch
# PATCH-FIX-UPSTREAM -- Fix systemd service file # PATCH-FIX-UPSTREAM -- Fix systemd service file
Patch11: plymouth-fix-systemd-service.patch Patch11: plymouth-fix-systemd-service.patch
# PATCH-FIX-UPSTREAM -- Start plymouth avec udev-trigger.service
Patch12: plymouth-after-udev-settle.patch
BuildRequires: automake BuildRequires: automake
BuildRequires: kernel-headers BuildRequires: kernel-headers
BuildRequires: libtool BuildRequires: libtool
@ -317,6 +319,7 @@ plugin.
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch12 -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

4
suse-initrd-support
View File

@ -121,11 +121,11 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in
+ 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" + _pangomod="/etc/pango/pango64.modules"
+ pangobasicfc="/usr/lib64/pango/1.6.0/modules/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" + _pangomod="/etc/pango/pango.modules"
+ pangobasicfc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so" + pangobasicfc="${_pangodir}/pango-basic-fc.so"
+fi +fi
+install -D ${_pangomod} $tmp_mnt/${_pangomod} +install -D ${_pangomod} $tmp_mnt/${_pangomod}
+install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc} +install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}