- Look for inst() in dracut as well as mkinitrd bash source file
- Drop plymouth initrd for now.
This commit is contained in:
Ray Strode
parent
7c18b82c5d
commit
ad7e4fe2f9
@ -1,24 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
[ -z "$DESTDIR" ] || exit 0
|
||||
|
||||
[ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="/usr/libexec"
|
||||
[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="/usr/share"
|
||||
[ -z "$PLYMOUTH_POPULATE_INITRD" ] && PLYMOUTH_POPULATE_INITRD="$PLYMOUTH_LIBEXECDIR/plymouth/plymouth-populate-initrd"
|
||||
[ -z "$PLYMOUTH_DESTDIR" ] && PLYMOUTH_DESTDIR="/boot"
|
||||
[ -z "$PLYMOUTH_IMAGE_FILE" ] && PLYMOUTH_IMAGE_FILE="$PLYMOUTH_DESTDIR/initrd-plymouth.img"
|
||||
|
||||
PLYMOUTH_INITRD_DIR="$(mktemp --tmpdir -d plymouth-XXXXXXX)"
|
||||
|
||||
$PLYMOUTH_POPULATE_INITRD -t "$PLYMOUTH_INITRD_DIR"
|
||||
|
||||
if [ $? -eq 0 ]; then
|
||||
(cd $PLYMOUTH_INITRD_DIR;
|
||||
# FIXME: might make sense to add a flag to plymouth-populate-initrd to
|
||||
# skip these from the start
|
||||
rm -f lib*/{ld*,libc*,libdl*,libm*,libz*,libpthread*}
|
||||
find | cpio -Hnewc -o | gzip -9 > $PLYMOUTH_IMAGE_FILE
|
||||
)
|
||||
fi
|
||||
|
||||
rm -rf $PLYMOUTH_INITRD_DIR
|
||||
@ -1,19 +1,17 @@
|
||||
%define plymouthdaemon_execdir /sbin
|
||||
%define plymouthclient_execdir /bin
|
||||
%define plymouth_libdir /%{_lib}
|
||||
%define plymouth_initrd_file /boot/initrd-plymouth.img
|
||||
|
||||
Summary: Graphical Boot Animation and Logger
|
||||
Name: plymouth
|
||||
Version: 0.7.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
|
||||
Source1: boot-duration
|
||||
Source2: charge.plymouth
|
||||
Source3: plymouth-set-default-plugin
|
||||
Source4: plymouth-generate-initrd
|
||||
|
||||
URL: http://freedesktop.org/software/plymouth/releases
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
@ -27,6 +25,7 @@ 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
|
||||
Patch1: 0001-populate-initrd-Try-to-find-inst-more-aggressively.patch
|
||||
|
||||
%description
|
||||
Plymouth provides an attractive graphical boot animation in
|
||||
@ -235,6 +234,7 @@ plugin.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .plugin-path
|
||||
%patch1 -p1 -b .inst-function
|
||||
|
||||
%build
|
||||
%configure --enable-tracing --disable-tests --without-boot-entry \
|
||||
@ -280,19 +280,11 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/plymouth/themes/glow
|
||||
cp $RPM_SOURCE_DIR/plymouth-set-default-plugin $RPM_BUILD_ROOT%{_sbindir}
|
||||
chmod +x $RPM_BUILD_ROOT%{_sbindir}/plymouth-set-default-plugin
|
||||
|
||||
# Copied from git until the next release or snapshot
|
||||
cp $RPM_SOURCE_DIR/plymouth-generate-initrd $RPM_BUILD_ROOT%{_libexecdir}/plymouth
|
||||
chmod +x $RPM_BUILD_ROOT%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT$(dirname %{plymouth_initrd_file})
|
||||
touch $RPM_BUILD_ROOT%{plymouth_initrd_file}
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
|
||||
%postun
|
||||
if [ $1 -eq 0 ]; then
|
||||
@ -308,7 +300,6 @@ export LIB=%{_lib}
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme text
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -317,7 +308,6 @@ export LIB=%{_lib}
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme --reset
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -326,7 +316,6 @@ export LIB=%{_lib}
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme --reset
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -337,7 +326,6 @@ if [ $1 -eq 1 ]; then
|
||||
else
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme charge
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -346,7 +334,6 @@ export LIB=%{_lib}
|
||||
if [ $1 -eq 0 ]; then
|
||||
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "charge" ]; then
|
||||
%{_sbindir}/plymouth-set-default-theme --reset
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -369,7 +356,6 @@ fi
|
||||
%{_localstatedir}/run/plymouth
|
||||
%{_localstatedir}/spool/plymouth
|
||||
%ghost %{_localstatedir}/lib/plymouth/boot-duration
|
||||
%ghost %{plymouth_initrd_file}
|
||||
|
||||
%files devel
|
||||
%defattr(-, root, root)
|
||||
@ -390,7 +376,6 @@ fi
|
||||
%{_sbindir}/plymouth-set-default-plugin
|
||||
%{_libexecdir}/plymouth/plymouth-update-initrd
|
||||
%{_libexecdir}/plymouth/plymouth-populate-initrd
|
||||
%{_libexecdir}/plymouth/plymouth-generate-initrd
|
||||
|
||||
%files utils
|
||||
%defattr(-, root, root)
|
||||
@ -465,6 +450,10 @@ fi
|
||||
%defattr(-, root, root)
|
||||
|
||||
%changelog
|
||||
* Wed Sep 9 2009 Ray Strode <rstrode@redhat.com> 0.7.1-4
|
||||
- Look for inst() in dracut as well as mkinitrd bash source file
|
||||
- Drop plymouth initrd for now.
|
||||
|
||||
* Fri Aug 28 2009 Ray Strode <rstrode@redhat.com> 0.7.1-3
|
||||
- Create plymouth supplementary initrd in post (bug 515589)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user