Raymond Wooninck 2012-05-15 09:10:11 +00:00 committed by Git OBS Bridge
parent 5e2ae6b917
commit d1889a3264
3 changed files with 24 additions and 26 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue May 15 09:09:23 UTC 2012 - tittiatcoke@gmail.com
- Added a patch for openSUSE to enable the rebuild of the initrd
with the plymouth-set-default-theme script. (bnc#757284)
------------------------------------------------------------------- -------------------------------------------------------------------
Sun May 13 19:21:24 UTC 2012 - tittiatcoke@gmail.com Sun May 13 19:21:24 UTC 2012 - tittiatcoke@gmail.com

View File

@ -344,7 +344,8 @@ make %{?_smp_mflags}
%make_install %make_install
rm -f %{buildroot}/%{_bindir}/rhgb-client rm -f %{buildroot}/%{_bindir}/rhgb-client
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-*-initrd rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-generate-initrd
rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-populate-initrd
#Link the plymouth client binary also to /bin until the move to /usr is completed #Link the plymouth client binary also to /bin until the move to /usr is completed
mkdir %{buildroot}/bin mkdir %{buildroot}/bin
@ -421,10 +422,7 @@ fi
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
%{_sbindir}/plymouth-set-default-theme spinfinity %{_sbindir}/plymouth-set-default-theme -R spinfinity
if [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd
fi
fi fi
fi fi
@ -432,8 +430,7 @@ fi
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then
%{_sbindir}/plymouth-set-default-theme --reset %{_sbindir}/plymouth-set-default-theme -R --reset
/sbin/mkinitrd
fi fi
fi fi
@ -441,10 +438,7 @@ fi
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
%{_sbindir}/plymouth-set-default-theme fade-in %{_sbindir}/plymouth-set-default-theme -R fade-in
if [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd
fi
fi fi
fi fi
@ -452,8 +446,7 @@ fi
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then
%{_sbindir}/plymouth-set-default-theme --reset %{_sbindir}/plymouth-set-default-theme -R --reset
/sbin/mkinitrd
fi fi
fi fi
@ -461,10 +454,7 @@ fi
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
%{_sbindir}/plymouth-set-default-theme solar %{_sbindir}/plymouth-set-default-theme -R solar
if [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd
fi
fi fi
fi fi
@ -472,8 +462,7 @@ fi
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export lib=%{_libdir} export lib=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then
%{_sbindir}/plymouth-set-default-theme --reset %{_sbindir}/plymouth-set-default-theme -R --reset
/sbin/mkinitrd
fi fi
fi fi
@ -481,10 +470,7 @@ fi
if [ $1 -eq 1 ]; then if [ $1 -eq 1 ]; then
export LIB=%{_libdir} export LIB=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then
%{_sbindir}/plymouth-set-default-theme openSUSE %{_sbindir}/plymouth-set-default-theme -R openSUSE
if [ -x /sbin/mkinitrd ]; then
/sbin/mkinitrd
fi
fi fi
fi fi
@ -492,8 +478,7 @@ fi
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
export lib=%{_libdir} export lib=%{_libdir}
if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then
%{_sbindir}/plymouth-set-default-theme --reset %{_sbindir}/plymouth-set-default-theme -R --reset
/sbin/mkinitrd
fi fi
fi fi
@ -504,7 +489,6 @@ fi
%dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes
%dir %{_datadir}/plymouth/themes/details %dir %{_datadir}/plymouth/themes/details
%dir %{_datadir}/plymouth/themes/text %dir %{_datadir}/plymouth/themes/text
%dir %{_libexecdir}/plymouth
%dir %{_localstatedir}/lib/plymouth %dir %{_localstatedir}/lib/plymouth
%dir %{_libdir}/plymouth %dir %{_libdir}/plymouth
%dir %{_libdir}/plymouth/renderers %dir %{_libdir}/plymouth/renderers
@ -554,7 +538,9 @@ fi
%files scripts %files scripts
%defattr(-, root, root) %defattr(-, root, root)
%dir %{_libexecdir}/plymouth
%{_sbindir}/plymouth-set-default-theme %{_sbindir}/plymouth-set-default-theme
%{_libexecdir}/plymouth/plymouth-update-initrd
/lib/mkinitrd/scripts/boot-plymouth.sh /lib/mkinitrd/scripts/boot-plymouth.sh
/lib/mkinitrd/scripts/boot-plymouth.chroot.sh /lib/mkinitrd/scripts/boot-plymouth.chroot.sh
/lib/mkinitrd/scripts/setup-plymouth.sh /lib/mkinitrd/scripts/setup-plymouth.sh

View File

@ -93,3 +93,9 @@
+fi +fi
+install -D ${_pangomod} $tmp_mnt/${_pangomod} +install -D ${_pangomod} $tmp_mnt/${_pangomod}
+mkdir -p $tmp_mnt/var/cache/fontconfig +mkdir -p $tmp_mnt/var/cache/fontconfig
--- plymouth-0.8.4/scripts/plymouth-update-initrd 2008-12-19 05:36:55.000000000 +0100
+++ new/scripts/plymouth-update-initrd 2012-05-15 10:59:08.158501726 +0200
@@ -1,2 +1,2 @@
#!/bin/bash
-mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
+mkinitrd -i initrd-$(uname -r) -k vmlinuz-$(uname -r)