Accepting request 131391 from Base:System
- 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:
commit
366668335a
13
plymouth-after-udev-settle.patch
Normal file
13
plymouth-after-udev-settle.patch
Normal 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
|
@ -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
|
||||
|
||||
|
@ -52,6 +52,8 @@ Patch9: 0001-ply-text-progress-bar-strip-quotes-if-present.patch
|
||||
Patch10: 0001-Some-greenish-openSUSE-colors.patch
|
||||
# PATCH-FIX-UPSTREAM -- Fix systemd service file
|
||||
Patch11: plymouth-fix-systemd-service.patch
|
||||
# PATCH-FIX-UPSTREAM -- Start plymouth avec udev-trigger.service
|
||||
Patch12: plymouth-after-udev-settle.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: kernel-headers
|
||||
BuildRequires: libtool
|
||||
@ -317,6 +319,7 @@ plugin.
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%patch10 -p1
|
||||
%patch12 -p1
|
||||
|
||||
# replace builddate with patch0date
|
||||
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
|
||||
|
@ -121,11 +121,11 @@ Index: plymouth-0.8.6.1/scripts/setup-plymouth.sh.in
|
||||
+ then
|
||||
+ _pangodir=`pango-querymodules-64 | grep ModulesPath | awk '{print $4}'`
|
||||
+ _pangomod="/etc/pango/pango64.modules"
|
||||
+ pangobasicfc="/usr/lib64/pango/1.6.0/modules/pango-basic-fc.so"
|
||||
+ pangobasicfc="${_pangodir}/pango-basic-fc.so"
|
||||
+ else
|
||||
+ _pangodir=`pango-querymodules | grep ModulesPath | awk '{print $4}'`
|
||||
+ _pangomod="/etc/pango/pango.modules"
|
||||
+ pangobasicfc="/usr/lib/pango/1.6.0/modules/pango-basic-fc.so"
|
||||
+ pangobasicfc="${_pangodir}/pango-basic-fc.so"
|
||||
+fi
|
||||
+install -D ${_pangomod} $tmp_mnt/${_pangomod}
|
||||
+install -D ${pangobasicfc} $tmp_mnt/${pangobasicfc}
|
||||
|
Loading…
Reference in New Issue
Block a user