From 0107f755d9c3eb62c58c575435c8f9c68d1c8237397f1021566677a4c8ec4314 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Tue, 5 Jun 2012 18:03:23 +0000 Subject: [PATCH] - Updated to git snapshot 2012/5/21 - Many updates and additions - Replaced by git version: - iwlwifi-105-6.ucode - iwlwifi-135-6.ucode - iwlwifi-2000-6.ucode - iwlwifi-2030-6.ucode - bnx2/bnx2-mips-06-6.2.3.fw - bnx2/bnx2-mips-09-6.2.1b.fw - t4fw.bin (also updated to 1.4.16.0) - Removed: - brcm/bcm4329-fullmac-4.txt (was a development board) - mwl8335_duplex.fw (driver never included) - Renamed: - libertas/lbtf_usb.bin -> lbtf_usb.bin (as requested by driver) OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=51 --- .gitattributes | 7 ------- bnx2-mips-06-6.2.3.fw | 3 --- bnx2-mips-09-6.2.1b.fw | 3 --- iwlwifi-105-6.ucode | 3 --- iwlwifi-135-6.ucode | 3 --- iwlwifi-2000-6.ucode | 3 --- iwlwifi-2030-6.ucode | 3 --- kernel-firmware.changes | 19 +++++++++++++++++++ kernel-firmware.spec | 23 +++++------------------ linux-firmware-20111025git.tar.bz2 | 3 --- linux-firmware-20120521git.tar.bz2 | 3 +++ t4fw.bin | 3 --- 12 files changed, 27 insertions(+), 49 deletions(-) delete mode 100644 bnx2-mips-06-6.2.3.fw delete mode 100644 bnx2-mips-09-6.2.1b.fw delete mode 100644 iwlwifi-105-6.ucode delete mode 100644 iwlwifi-135-6.ucode delete mode 100644 iwlwifi-2000-6.ucode delete mode 100644 iwlwifi-2030-6.ucode delete mode 100644 linux-firmware-20111025git.tar.bz2 create mode 100644 linux-firmware-20120521git.tar.bz2 delete mode 100644 t4fw.bin diff --git a/.gitattributes b/.gitattributes index bcd9e15..7e6dad7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,11 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -bnx2-mips-06-6.2.3.fw filter=lfs diff=lfs merge=lfs -text -bnx2-mips-09-6.2.1b.fw filter=lfs diff=lfs merge=lfs -text -iwlwifi-105-6.ucode filter=lfs diff=lfs merge=lfs -text -iwlwifi-135-6.ucode filter=lfs diff=lfs merge=lfs -text -iwlwifi-2000-6.ucode filter=lfs diff=lfs merge=lfs -text -iwlwifi-2030-6.ucode filter=lfs diff=lfs merge=lfs -text iwlwifi-4965-1.ucode filter=lfs diff=lfs merge=lfs -text -t4fw.bin filter=lfs diff=lfs merge=lfs -text diff --git a/bnx2-mips-06-6.2.3.fw b/bnx2-mips-06-6.2.3.fw deleted file mode 100644 index d4df31e..0000000 --- a/bnx2-mips-06-6.2.3.fw +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b3daef88cac7a7f402a3e11903c64424b8f43292fc3aa2f944943abb1db330ea -size 92824 diff --git a/bnx2-mips-09-6.2.1b.fw b/bnx2-mips-09-6.2.1b.fw deleted file mode 100644 index c50a9c8..0000000 --- a/bnx2-mips-09-6.2.1b.fw +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:88a0da6d4b22bc3011e9e08e35f1746e44a0fff910f33f371477983b3a115b47 -size 103904 diff --git a/iwlwifi-105-6.ucode b/iwlwifi-105-6.ucode deleted file mode 100644 index ac8e2e3..0000000 --- a/iwlwifi-105-6.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb5c90756de33f044ebf82e0a9295f73534577d6b011be3b79df98412880487 -size 689680 diff --git a/iwlwifi-135-6.ucode b/iwlwifi-135-6.ucode deleted file mode 100644 index 7986bd3..0000000 --- a/iwlwifi-135-6.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db87dd4a4307bf5b553de80dd135598319fc6c8133dac8cc8d1673e9c27f5ee1 -size 701228 diff --git a/iwlwifi-2000-6.ucode b/iwlwifi-2000-6.ucode deleted file mode 100644 index b8df416..0000000 --- a/iwlwifi-2000-6.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f026eed05503e1fe752bebcd1e0a03aed79d0da757ae69d7dea82295036f1f82 -size 695876 diff --git a/iwlwifi-2030-6.ucode b/iwlwifi-2030-6.ucode deleted file mode 100644 index 2c87e78..0000000 --- a/iwlwifi-2030-6.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d84a8cbdaa1fd12917a8b65a08d4ba59fae1d578444389fcf5982193e3e8b9d -size 707392 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 724e140..99610f1 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jun 5 17:52:54 UTC 2012 - jeffm@suse.com + +- Updated to git snapshot 2012/5/21 + - Many updates and additions + - Replaced by git version: + - iwlwifi-105-6.ucode + - iwlwifi-135-6.ucode + - iwlwifi-2000-6.ucode + - iwlwifi-2030-6.ucode + - bnx2/bnx2-mips-06-6.2.3.fw + - bnx2/bnx2-mips-09-6.2.1b.fw + - t4fw.bin (also updated to 1.4.16.0) + - Removed: + - brcm/bcm4329-fullmac-4.txt (was a development board) + - mwl8335_duplex.fw (driver never included) + - Renamed: + - libertas/lbtf_usb.bin -> lbtf_usb.bin (as requested by driver) + ------------------------------------------------------------------- Tue May 8 10:25:51 UTC 2012 - jslaby@suse.cz diff --git a/kernel-firmware.spec b/kernel-firmware.spec index e250001..7755fd6 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,25 +19,19 @@ Name: kernel-firmware BuildRequires: fdupes BuildRequires: kernel-default -Version: 20111025git +Version: 20120521git Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware ; GPL-2.0 ; GPL-2.0+ ; MIT Group: System/Kernel -Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ -# currently down Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ +Url: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git +# Created with git archive | bzip2 Source0: linux-firmware-%{version}.tar.bz2 Source1: firmware.sh Source2: qlogic.tar.bz2 Source3: iwlwifi-4965-1.ucode -Source4: t4fw.bin -Source5: bnx2-mips-06-6.2.3.fw -Source6: bnx2-mips-09-6.2.1b.fw -Source7: iwlwifi-105-6.ucode -Source8: iwlwifi-135-6.ucode -Source9: iwlwifi-2000-6.ucode -Source10: iwlwifi-2030-6.ucode %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 @@ -79,15 +73,8 @@ previously included in the kernel. It is shared by all kernels >= %prep -%setup -q -n linux-firmware-%version -a 2 +%setup -q -c kernel-firmware -a 2 cp -v %{S:3} iwlwifi-4965-1.ucode -cp -v %{S:7} . -cp -v %{S:8} . -cp -v %{S:9} . -cp -v %{S:10} . -cp -v %{S:4} cxgb4/t4fw.bin -cp -v %{S:5} bnx2/bnx2-mips-06-6.2.3.fw -cp -v %{S:6} bnx2/bnx2-mips-09-6.2.1b.fw %build # nothing to do diff --git a/linux-firmware-20111025git.tar.bz2 b/linux-firmware-20111025git.tar.bz2 deleted file mode 100644 index 93b7fd5..0000000 --- a/linux-firmware-20111025git.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b78e4d50fa963819d8b724fe2418a17e2243528591780d25ddebb5925f9501a9 -size 16692496 diff --git a/linux-firmware-20120521git.tar.bz2 b/linux-firmware-20120521git.tar.bz2 new file mode 100644 index 0000000..6de89d0 --- /dev/null +++ b/linux-firmware-20120521git.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e931397e6e8c6b6767458048897ca41136381c341c0b4cc716a9f9e210efe54 +size 21850956 diff --git a/t4fw.bin b/t4fw.bin deleted file mode 100644 index e912292..0000000 --- a/t4fw.bin +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed4b49bdaea69ddd15aa996e6ad899dd12979055148f04d8667df30e2c76f565 -size 241664