From b044196e2171b3aca2f6384ff2f37e47f4dc8027352ba4493f68a9f64407dc89 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 3 Sep 2014 12:27:09 +0000 Subject: [PATCH] Accepting request 247400 from home:tiwai:branches:Kernel:HEAD - Sync with SLE12 package * Includes previously cherry-picked QLogic firmware (bnc#879633) * Intel BT firmware updates * cxgb4 firmware update to revision 1.11.27.0 * bnx2x firmware version 7.10.51 (bnc#887382) * dvb-fe-xc5000c-4.1.30.7.fw for xc5000 (bnc#884321) * Drop the obsoleted mkinitrd scripts * Use standard macros, posttrans for initrd updates - Update to git snapshot 20140903: * Another Intel BT firmware updates (bnc#894810) OBS-URL: https://build.opensuse.org/request/show/247400 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=85 --- kernel-firmware.changes | 14 +++++++ kernel-firmware.spec | 60 ++++++++++-------------------- linux-firmware-20140624git.tar.bz2 | 3 -- linux-firmware-20140903git.tar.xz | 3 ++ mkinitrd_boot-amd_microcode.sh | 8 ---- mkinitrd_setup-amd_microcode.sh | 36 ------------------ 6 files changed, 37 insertions(+), 87 deletions(-) delete mode 100644 linux-firmware-20140624git.tar.bz2 create mode 100644 linux-firmware-20140903git.tar.xz delete mode 100644 mkinitrd_boot-amd_microcode.sh delete mode 100644 mkinitrd_setup-amd_microcode.sh diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 326a2d1..3e201a3 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Wed Sep 3 12:57:59 CEST 2014 - tiwai@suse.de + +- Sync with SLE12 package + * Includes previously cherry-picked QLogic firmware (bnc#879633) + * Intel BT firmware updates + * cxgb4 firmware update to revision 1.11.27.0 + * bnx2x firmware version 7.10.51 (bnc#887382) + * dvb-fe-xc5000c-4.1.30.7.fw for xc5000 (bnc#884321) + * Drop the obsoleted mkinitrd scripts + * Use standard macros, posttrans for initrd updates +- Update to git snapshot 20140903: + * Another Intel BT firmware updates (bnc#894810) + ------------------------------------------------------------------- Tue Jun 24 15:31:52 CEST 2014 - tiwai@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 930408a..65414cf 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,17 +19,16 @@ Name: kernel-firmware BuildRequires: fdupes BuildRequires: kernel-default -Version: 20140624git +BuildRequires: suse-module-tools +Version: 20140903git Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware and GPL-2.0 and GPL-2.0+ and MIT Group: System/Kernel -Url: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ +Url: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git # Created with git archive | bzip2 -Source0: linux-firmware-%{version}.tar.bz2 +Source0: linux-firmware-%{version}.tar.xz Source1: firmware.sh -Source5: mkinitrd_setup-amd_microcode.sh -Source6: mkinitrd_boot-amd_microcode.sh %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements %define __ksyms_supplements bash %_sourcedir/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements @@ -79,14 +78,12 @@ Group: System/Kernel This package contains the microcode files used by AMD CPUs. %prep -%setup -q -c kernel-firmware +%setup -q -n linux-firmware-%version %build # nothing to do %install -install -D -m 0755 %{SOURCE5} %{buildroot}/lib/mkinitrd/scripts/setup-amd_microcode.sh -install -D -m 0755 %{SOURCE6} %{buildroot}/lib/mkinitrd/scripts/boot-amd_microcode.sh mkdir -p %{buildroot}/lib/firmware cp -avf * %{buildroot}/lib/firmware rm -f %{buildroot}/lib/firmware/WHENCE @@ -102,45 +99,28 @@ rm -rf %{buildroot}/lib/firmware/carl9170fw %clean rm -rf %{buildroot} -%post -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 +%post +%{?regenerate_initrd_post} -%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 +%post -n ucode-amd +%{?regenerate_initrd_post} + +%posttrans +%{?regenerate_initrd_posttrans} + +%posttrans -n ucode-amd +%{?regenerate_initrd_posttrans} %files %defattr(0644,root,root,0755) -%doc WHENCE README GPL-3 LICENCE.* -%exclude /lib/firmware/amd-ucode/microcode_amd.bin* -%exclude /lib/firmware/amd-ucode/microcode_amd_fam15h.bin* +%doc WHENCE README GPL-3 LICEN[CS]E.* +%exclude /lib/firmware/amd-ucode/microcode_amd.bin +%exclude /lib/firmware/amd-ucode/microcode_amd_fam15h.bin /lib/firmware/* %files -n ucode-amd %defattr(0644,root,root,0755) -/lib/firmware/amd-ucode/microcode_amd.bin* -/lib/firmware/amd-ucode/microcode_amd_fam15h.bin* -/lib/firmware/amd-ucode/ -%dir /lib/mkinitrd -%dir /lib/mkinitrd/scripts -%attr(0755,root,root) /lib/mkinitrd/scripts/setup-amd_microcode.sh -%attr(0755,root,root) /lib/mkinitrd/scripts/boot-amd_microcode.sh +/lib/firmware/amd-ucode/microcode_amd.bin +/lib/firmware/amd-ucode/microcode_amd_fam15h.bin %changelog diff --git a/linux-firmware-20140624git.tar.bz2 b/linux-firmware-20140624git.tar.bz2 deleted file mode 100644 index 7a1d4cd..0000000 --- a/linux-firmware-20140624git.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:acb1938de53811d24dd77ea0b0105db5d32bfa649cc8cbcc62f1ec42fd48fc6d -size 36959359 diff --git a/linux-firmware-20140903git.tar.xz b/linux-firmware-20140903git.tar.xz new file mode 100644 index 0000000..7f67dc1 --- /dev/null +++ b/linux-firmware-20140903git.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:adaa6534447804ae80483385450b2aec6643f06c11acf76d964f3ee7f0207b4c +size 24265080 diff --git a/mkinitrd_boot-amd_microcode.sh b/mkinitrd_boot-amd_microcode.sh deleted file mode 100644 index 678ed2d..0000000 --- a/mkinitrd_boot-amd_microcode.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -#%stage: boot -#%depends: udev - -if [ -w /sys/devices/system/cpu/microcode/reload ];then - echo 1 >/sys/devices/system/cpu/microcode/reload -fi diff --git a/mkinitrd_setup-amd_microcode.sh b/mkinitrd_setup-amd_microcode.sh deleted file mode 100644 index 4ccd691..0000000 --- a/mkinitrd_setup-amd_microcode.sh +++ /dev/null @@ -1,36 +0,0 @@ -#/bin/bash - -#%stage: boot -# -# Adds AMD microcode to the initrd -# -# If processor(s) are upgraded on the system, mkinitrd has to be re-called -# manually to include a possible other needed firmware to the initrd -# - -if grep -q -i AuthenticAMD /proc/cpuinfo; then - echo -n "Microcode: " - if [ ! -e /lib/firmware/amd-ucode ];then - echo "AMD microcode not found, amd-ucode package not installed?" - return 0 - fi - fam=`head /proc/cpuinfo |sed -n -e 's/cpu family.*: \([0-9]\+\)/\1/p'` - # Only try to update when family >= 16 (0x10, fam 10h) - if [ $fam -ge 16 >& /dev/null ];then - # Family 0x15 firmware is named: microcode_amd_famXXh.bin" - if [ $fam -lt 21 >& /dev/null ];then - file=microcode_amd.bin - else - file=`printf "microcode_amd_fam%xh.bin" $fam` - fi - if [ -e /lib/firmware/amd-ucode ];then - echo "Adding AMD microcode $file" - mkdir -p $tmp_mnt/lib/firmware/amd-ucode - cp /lib/firmware/amd-ucode/"$file"* $tmp_mnt/lib/firmware/amd-ucode - else - echo "No AMD microcode found, amd-ucode package not installed?" - fi - else - printf "AMD CPU family: 0x%x does not support microcode updates" $fam - fi -fi