From 5e2ae6b917bc759296537a7fcf5036e133792f38b6f9842006a7659fd2ec64cd Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sun, 13 May 2012 19:22:32 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=34 --- plymouth.changes | 6 ++++++ plymouth.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/plymouth.changes b/plymouth.changes index 879ec4e..f9977cd 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun May 13 19:21:24 UTC 2012 - tittiatcoke@gmail.com + +- Added plymouth to the requires of plymouth-scripts. This + should resolve bug (bnc#757284) + ------------------------------------------------------------------- Fri May 11 19:56:24 UTC 2012 - nmo.marques@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 9b00433..1a00e20 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -140,6 +140,7 @@ Requires: cpio Requires: findutils Requires: gzip Requires: mkinitrd +Requires: plymouth BuildArch: noarch %description scripts @@ -231,6 +232,7 @@ Supplements: packageand(plymouth:branding-upstream) Provides: %{name}-branding = %{version} BuildArch: noarch Conflicts: otherproviders(plymouth-branding) +Requires(pre): %{name} %description branding-upstream This metapackage tracks the Plymouth default theme from upstream. @@ -264,6 +266,7 @@ while stars twinkle around the logo during system boot up. Summary: Plymouth "Spinfinity" theme Group: System/Base Requires: %{name}-plugin-throbgress = %{version} +Requires(pre): %{name} BuildArch: noarch Requires(post): %{name}-scripts From d1889a3264d8d3fb4c9901b81c3379621596a48f5798fab66f15afd19ac173e5 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Tue, 15 May 2012 09:10:11 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=36 --- plymouth.changes | 6 ++++++ plymouth.spec | 38 ++++++++++++-------------------------- suse-initrd-support | 6 ++++++ 3 files changed, 24 insertions(+), 26 deletions(-) diff --git a/plymouth.changes b/plymouth.changes index f9977cd..e1ff63f 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -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 diff --git a/plymouth.spec b/plymouth.spec index 1a00e20..38b1548 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -344,7 +344,8 @@ make %{?_smp_mflags} %make_install 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 mkdir %{buildroot}/bin @@ -421,10 +422,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme spinfinity - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R spinfinity fi fi @@ -432,8 +430,7 @@ fi if [ $1 -eq 0 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -441,10 +438,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme fade-in - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R fade-in fi fi @@ -452,8 +446,7 @@ fi if [ $1 -eq 0 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -461,10 +454,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme solar - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R solar fi fi @@ -472,8 +462,7 @@ fi if [ $1 -eq 0 ]; then export lib=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -481,10 +470,7 @@ fi if [ $1 -eq 1 ]; then export LIB=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme openSUSE - if [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd - fi + %{_sbindir}/plymouth-set-default-theme -R openSUSE fi fi @@ -492,8 +478,7 @@ fi if [ $1 -eq 0 ]; then export lib=%{_libdir} if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then - %{_sbindir}/plymouth-set-default-theme --reset - /sbin/mkinitrd + %{_sbindir}/plymouth-set-default-theme -R --reset fi fi @@ -504,7 +489,6 @@ fi %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details %dir %{_datadir}/plymouth/themes/text -%dir %{_libexecdir}/plymouth %dir %{_localstatedir}/lib/plymouth %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers @@ -554,7 +538,9 @@ fi %files scripts %defattr(-, root, root) +%dir %{_libexecdir}/plymouth %{_sbindir}/plymouth-set-default-theme +%{_libexecdir}/plymouth/plymouth-update-initrd /lib/mkinitrd/scripts/boot-plymouth.sh /lib/mkinitrd/scripts/boot-plymouth.chroot.sh /lib/mkinitrd/scripts/setup-plymouth.sh diff --git a/suse-initrd-support b/suse-initrd-support index d8e9f92..ad20771 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -93,3 +93,9 @@ +fi +install -D ${_pangomod} $tmp_mnt/${_pangomod} +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)