rpms/plymouth/devel 0001-populate-initrd-Get-plugin-path-from-plymouth.patch, NONE, 1.1 plymouth.spec, 1.138, 1.139
Ray Strode
rstrode at fedoraproject.org
Tue Aug 25 18:57:05 UTC 2009
Author: rstrode
Update of /cvs/pkgs/rpms/plymouth/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6919
Modified Files:
plymouth.spec
Added Files:
0001-populate-initrd-Get-plugin-path-from-plymouth.patch
Log Message:
- Get plugin path from plymouth instead of trying
to guess. Should fix bug 502667
0001-populate-initrd-Get-plugin-path-from-plymouth.patch:
plymouth-populate-initrd.in | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
--- NEW FILE 0001-populate-initrd-Get-plugin-path-from-plymouth.patch ---
>From d633072a713b10092535058488225349f2180e21 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode at redhat.com>
Date: Tue, 25 Aug 2009 14:53:31 -0400
Subject: [PATCH] [populate-initrd] Get plugin path from plymouth
Previously, we'd try to guess the plugin path based
on the arch of the running process. That's sort of
fragile, so better to just install plugins where
plymouth says it's going to look for them.
---
scripts/plymouth-populate-initrd.in | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
index 09ccb32..3857197 100755
--- a/scripts/plymouth-populate-initrd.in
+++ b/scripts/plymouth-populate-initrd.in
@@ -4,17 +4,7 @@
[ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
[ -z "$DATADIR" ] && DATADIR="/usr/share"
-[ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
-if [ -z "$LIB" ]; then
- if $(echo nash-showelfinterp /proc/$$/exe | /sbin/nash --forcequiet | grep -q lib64); then
- LIB="lib64"
- else
- LIB="lib"
- fi
-fi
-[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
-[ -z "$BINDIR" ] && BINDIR="/usr/bin"
-[ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
+[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
[ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
@@ -66,9 +56,9 @@ mkdir -p ${INITRDDIR}${DATADIR}/plymouth/themes
inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
inst /bin/plymouth $INITRDDIR
inst ${DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
-inst ${LIBDIR}/plymouth/text.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
inst ${DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
-inst ${LIBDIR}/plymouth/details.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
inst @RELEASE_FILE@ $INITRDDIR
@@ -79,12 +69,12 @@ fi
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
-if [ ! -f ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so ]; then
+if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
exit 1
fi
-inst ${LIBDIR}/plymouth/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
+inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
for x in ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
--
1.6.4
Index: plymouth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plymouth/devel/plymouth.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- plymouth.spec 25 Aug 2009 17:54:28 -0000 1.138
+++ plymouth.spec 25 Aug 2009 18:57:05 -0000 1.139
@@ -5,7 +5,7 @@
Summary: Graphical Boot Animation and Logger
Name: plymouth
Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Base
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
@@ -24,6 +24,8 @@ Obsoletes: plymouth-text-and-details-onl
Obsoletes: plymouth-plugin-pulser < 0.7.0-0.2009.05.08.2
Obsoletes: plymouth-theme-pulser < 0.7.0-0.2009.05.08.2
+Patch0: 0001-populate-initrd-Get-plugin-path-from-plymouth.patch
+
%description
Plymouth provides an attractive graphical boot animation in
place of the text messages that normally get shown. Text
@@ -230,6 +232,7 @@ plugin.
%prep
%setup -q
+%patch0 -p1 -b .plugin-path
%build
%configure --enable-tracing --disable-tests --without-boot-entry \
@@ -444,6 +447,10 @@ fi
%defattr(-, root, root)
%changelog
+* Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-2
+- Get plugin path from plymouth instead of trying
+ to guess. Should fix bug 502667
+
* Tue Aug 25 2009 Ray Strode <rstrode at redhat.com> 0.7.1-1
- Update to 0.7.1
More information about the scm-commits
mailing list