From 7ddd021daada18abd4042a4b4600c8fa6f09eebecd8f0eb7fa0505b7bfb96d3f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 12 Jan 2016 07:41:18 +0000 Subject: [PATCH] Accepting request 353151 from home:bruno_friedmann:branches:Kernel:HEAD Find a refreshed git clone 20151207 version It adds fixes for several new hardware and for me fix boo#961416 I've use spec-cleaner to redapt spec file to standards And also added a long version for the how to git archive to simplify futur contribution. OBS-URL: https://build.opensuse.org/request/show/353151 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=111 --- kernel-firmware.changes | 26 +++++++++++++++++++++ kernel-firmware.spec | 38 +++++++++++++++---------------- linux-firmware-20151109git.tar.xz | 3 --- linux-firmware-20151207git.tar.xz | 3 +++ 4 files changed, 48 insertions(+), 22 deletions(-) delete mode 100644 linux-firmware-20151109git.tar.xz create mode 100644 linux-firmware-20151207git.tar.xz diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 0bbae32..e59857f 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Jan 11 18:09:56 UTC 2016 - bruno@ioda-net.ch + +- Update to version 20151207git (commit bbe4917) + * WHENCE: use https://linuxtv.org for LinuxTV URLs + * Add firmware for mt7601u. version 34. + * brcm: add initial firmware for bcm4371 11ac wifi device + * brcm: update firmware for bcm43602 device + * WHENCE: Remove claim that qed and bfa/bna firmware came from + kernel source + * WHENCE: Correct filename of qed firmware + * fix permissions on qed_init_values_zipped-8.4.2.0.bin + * qla2xxx: Update firmware version to 8.03.00 + * bnx2x: Add FW 7.13.1.0. + * Merge tag 'iwlwifi-fw-2015-11-18' + * iwlwifi: add new -16 firmware for iwlmvm devices + * linux-firmware: Update firmware patch for Intel Bluetooth 7265 + (C0/D0) + * qed: Add FW 8.4.2.0 + * fix WHENCE, which for some reason became executable + +- Use of spec-cleaner +- Fix boo#961416 +- Added complete instructions for contributors how to get + the tar.xz done + ------------------------------------------------------------------- Thu Dec 10 15:57:48 CET 2015 - tiwai@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index efd7cfa..6728290 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -1,7 +1,7 @@ # # spec file for package kernel-firmware # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,27 +16,28 @@ # +%define __find_supplements bash %{_sourcedir}/firmware.sh --find-supplements +%define __ksyms_supplements bash %{_sourcedir}/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements +%define __ksyms_path ^/lib/firmware Name: kernel-firmware -BuildRequires: fdupes -BuildRequires: kernel-default -BuildRequires: suse-module-tools -Version: 20151109git +Version: 20151207git 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/ -# Created with git archive | bzip2 +# Created with umask 022; cd /_tmp +# After git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git +# cd linux-firmware +# git archive --format=tar --prefix=linux-firmware-20151207git/ -v master ./ | xz -9 -M 4G --check=crc32 -T 4 > /tmp/linux-firmware-20151207git.tar.xz +# Source0: linux-firmware-%{version}.tar.xz Source1: firmware.sh # ast_dp501_fw.bin generated from header file of xf86-video-ast: MIT/X11 License Source2: ast_dp501_fw.bin -%define __find_supplements bash %_sourcedir/firmware.sh --find-supplements - -%define __ksyms_supplements bash %_sourcedir/firmware.sh --cache %{_builddir}/%{?buildsubdir}/find_supplements.cache --find-supplements -%define __ksyms_path ^/lib/firmware -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildRequires: fdupes +BuildRequires: kernel-default +BuildRequires: suse-module-tools Requires(post): coreutils Requires(postun): coreutils Provides: qlogic-firmware @@ -67,6 +68,8 @@ Provides: iwl6000g2-ucode Obsoletes: iwl6000g2-ucode Provides: ath3k-firmware Obsoletes: ath3k-firmware +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description This package contains the firmware for in-kernel drivers that was @@ -74,18 +77,18 @@ previously included in the kernel. It is shared by all kernels >= 2.6.27-rc1. %package -n ucode-amd -Supplements: modalias(x86cpu:vendor%3A0002%3Afamily%3A*%3Amodel%3A*%3Afeature%3A*) Summary: Microcode updates for AMD CPUs Group: System/Kernel Requires(post): coreutils Requires(postun): coreutils +Supplements: modalias(x86cpu:vendor%{3}A0002%{3}Afamily%{3}A*%{3}Amodel%{3}A*%{3}Afeature%{3}A*) %description -n ucode-amd This package contains the microcode files used by AMD CPUs. %prep -%setup -q -n linux-firmware-%version -cp %{S:2} . +%setup -q -n linux-firmware-%{version} +cp %{SOURCE2} . %build # nothing to do @@ -94,7 +97,7 @@ cp %{S:2} . mkdir -p %{buildroot}/lib/firmware cp -avf * %{buildroot}/lib/firmware rm -f %{buildroot}/lib/firmware/WHENCE -bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ +bash %{_sourcedir}/firmware.sh --kill-duplicates %{buildroot}/lib/firmware/ %fdupes %{buildroot} rm -f find_supplements.cache # In alsa-firmware @@ -103,9 +106,6 @@ rm -f %{buildroot}/lib/firmware/ctspeq.bin # Devel files rm -rf %{buildroot}/lib/firmware/carl9170fw -%clean -rm -rf %{buildroot} - %post %{?regenerate_initrd_post} diff --git a/linux-firmware-20151109git.tar.xz b/linux-firmware-20151109git.tar.xz deleted file mode 100644 index 92278fb..0000000 --- a/linux-firmware-20151109git.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:76623d6e50489e9051187bbeff0c0e9f629e6211a5d0d4bb7f8525ce6e23745b -size 32985416 diff --git a/linux-firmware-20151207git.tar.xz b/linux-firmware-20151207git.tar.xz new file mode 100644 index 0000000..9f01a01 --- /dev/null +++ b/linux-firmware-20151207git.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10445b06a623c78c497ca2775583359c5c3b514f83d66fbf57aee3977e46fd03 +size 34084720