From 0bfcbf9c7cca0de36bed6c89eb11fa255db2fd00fd4f9c609f0a5f7e77cd4cb0 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 12 Feb 2014 10:29:48 +0000 Subject: [PATCH] Accepting request 211750 from home:msmeissn:branches:Kernel:HEAD - fixed last submission to actually build. OBS-URL: https://build.opensuse.org/request/show/211750 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=75 --- kernel-firmware.changes | 5 +++++ kernel-firmware.spec | 26 ++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 80f72d8..1e67940 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 19 16:27:35 UTC 2013 - meissner@suse.com + +- fixed last submission to actually build. + ------------------------------------------------------------------- Tue Dec 10 15:46:02 UTC 2013 - trenn@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 9acbcde..1ec7800 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -16,7 +16,6 @@ # - Name: kernel-firmware BuildRequires: fdupes BuildRequires: kernel-default @@ -109,11 +108,26 @@ rm -rf %{buildroot} %post -n ucode-amd [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup -if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then - echo "Skipping recreation of existing initial ramdisks, due" - echo "to presence of /var/lib/no_initrd_recreation_by_suspend" -elif [ -x /sbin/mkinitrd ]; then - /sbin/mkinitrd +if [ "${YAST_IS_RUNNING}" != "instsys" ]; then + if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then + echo "Skipping recreation of existing initial ramdisks, due" + echo "to presence of /var/lib/no_initrd_recreation_by_suspend" + elif [ -x /sbin/mkinitrd ]; then + [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup + /sbin/mkinitrd || : + fi +fi + +%postun -n ucode-amd +[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup +if [ "${YAST_IS_RUNNING}" != "instsys" ]; then + if [ -e /var/lib/no_initrd_recreation_by_suspend ]; then + echo "Skipping recreation of existing initial ramdisks, due" + echo "to presence of /var/lib/no_initrd_recreation_by_suspend" + elif [ -x /sbin/mkinitrd ]; then + [ -x /sbin/mkinitrd_setup ] && /sbin/mkinitrd_setup + /sbin/mkinitrd || : + fi fi %files