From 36689a58448ca6064ec5ea7636b3928ef7c59be90600c2c7cf3912778e4cd78a Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 25 Jun 2014 19:29:39 +0000 Subject: [PATCH] Accepting request 238675 from home:tiwai:branches:Kernel:HEAD - Updated to git snapshot 20140624: including previous intel firmware files OBS-URL: https://build.opensuse.org/request/show/238675 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=83 --- .gitattributes | 2 -- ibt-hw-37.8.10-fw-1.10.2.27.d.bseq | 3 --- ibt-hw-37.8.bseq | Bin 96 -> 0 bytes iwlwifi-7265-ucode-22.24.8.0.tgz | 3 --- kernel-firmware.changes | 6 ++++++ kernel-firmware.spec | 13 +++---------- linux-firmware-20140319git.tar.bz2 | 3 --- linux-firmware-20140624git.tar.bz2 | 3 +++ 8 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 ibt-hw-37.8.10-fw-1.10.2.27.d.bseq delete mode 100644 ibt-hw-37.8.bseq delete mode 100644 iwlwifi-7265-ucode-22.24.8.0.tgz delete mode 100644 linux-firmware-20140319git.tar.bz2 create mode 100644 linux-firmware-20140624git.tar.bz2 diff --git a/.gitattributes b/.gitattributes index a661df0..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,5 +21,3 @@ *.xz filter=lfs diff=lfs merge=lfs -text *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text -## Specific LFS patterns -ibt-hw-37.8.10-fw-1.10.2.27.d.bseq filter=lfs diff=lfs merge=lfs -text diff --git a/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq b/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq deleted file mode 100644 index f4aa504..0000000 --- a/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:35639924b78043f9724fe40cde09df2f3e64e6505a3dec7de9b88d448554b1e8 -size 10612 diff --git a/ibt-hw-37.8.bseq b/ibt-hw-37.8.bseq deleted file mode 100644 index 10771cbdc6893d47d22fe1cb1ab86e37f1213214220e4e2f4c7672c0bf151f4d..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 96 zcmZS7{}aFf1GpJ3EkOVdGlDx#J8M3j^Z;ZV?U! qUj{jb9o#9BC)Te>yui-Fz#Y}r#^SuW24oZyKTwtaAEy6Ik_-TFCl?L? diff --git a/iwlwifi-7265-ucode-22.24.8.0.tgz b/iwlwifi-7265-ucode-22.24.8.0.tgz deleted file mode 100644 index e366e77..0000000 --- a/iwlwifi-7265-ucode-22.24.8.0.tgz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e94a1ec429c160f1ee6e1f55aef83fa68d38bc00fd21d9fe54c264ff506175df -size 356862 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 497ecdc..326a2d1 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 24 15:31:52 CEST 2014 - tiwai@suse.de + +- Updated to git snapshot 20140624: + including previous intel firmware files + ------------------------------------------------------------------- Fri Apr 4 17:41:05 CEST 2014 - tiwai@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 6af2301..930408a 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,18 +19,15 @@ Name: kernel-firmware BuildRequires: fdupes BuildRequires: kernel-default -Version: 20140319git +Version: 20140624git Release: 0 Summary: Linux kernel firmware files License: SUSE-Firmware and GPL-2.0 and GPL-2.0+ and MIT Group: System/Kernel -Url: http://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git +Url: https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/ # Created with git archive | bzip2 Source0: linux-firmware-%{version}.tar.bz2 Source1: firmware.sh -Source2: iwlwifi-7265-ucode-22.24.8.0.tgz -Source3: ibt-hw-37.8.10-fw-1.10.2.27.d.bseq -Source4: ibt-hw-37.8.bseq Source5: mkinitrd_setup-amd_microcode.sh Source6: mkinitrd_boot-amd_microcode.sh %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements @@ -82,11 +79,7 @@ Group: System/Kernel This package contains the microcode files used by AMD CPUs. %prep -%setup -q -c kernel-firmware -a 2 -mv iwlwifi-7265-ucode-22.24.8.0/* . -rmdir iwlwifi-7265-ucode-22.24.8.0 -install -c -m 0644 %{S:3} intel/ -install -c -m 0644 %{S:4} intel/ +%setup -q -c kernel-firmware %build # nothing to do diff --git a/linux-firmware-20140319git.tar.bz2 b/linux-firmware-20140319git.tar.bz2 deleted file mode 100644 index 8c07d0c..0000000 --- a/linux-firmware-20140319git.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2020107cd1a09258b379217307fbe540cc231d6816d89601ac73799006c53a5f -size 34201335 diff --git a/linux-firmware-20140624git.tar.bz2 b/linux-firmware-20140624git.tar.bz2 new file mode 100644 index 0000000..7a1d4cd --- /dev/null +++ b/linux-firmware-20140624git.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:acb1938de53811d24dd77ea0b0105db5d32bfa649cc8cbcc62f1ec42fd48fc6d +size 36959359