From aebca233c8002ccc04071dac348b0589b8e3001048f34c9a2c162f87d7f03796 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 20 Mar 2011 20:16:49 +0000 Subject: [PATCH] Accepting request 64570 from home:dirkmueller:branches:Kernel:HEAD thanks for doing this. OBS-URL: https://build.opensuse.org/request/show/64570 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=29 --- .gitattributes | 1 + _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 | 4 ++-- _service:set_version:kernel-firmware.spec | 6 ++++-- iwlwifi-5000-5.ucode | 3 +++ kernel-firmware.changes | 5 +++++ kernel-firmware.spec | 6 ++++-- 6 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 iwlwifi-5000-5.ucode diff --git a/.gitattributes b/.gitattributes index 405dd3a..cf9c256 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,5 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns +iwlwifi-5000-5.ucode filter=lfs diff=lfs merge=lfs -text iwlwifi-6000-4.ucode filter=lfs diff=lfs merge=lfs -text diff --git a/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 b/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 index b46d78d..732c502 100644 --- a/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 +++ b/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:daa63b7397127c644ed2aa92644f262aa604873fb16b288bac7f829f1c27d5fa -size 26719539 +oid sha256:f2e7832fed93bf563d200469daae7794336119f69f7fbc3396bf4e6b7c0a754f +size 26893995 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec index 0ba61b9..28444e3 100644 --- a/_service:set_version:kernel-firmware.spec +++ b/_service:set_version:kernel-firmware.spec @@ -27,7 +27,8 @@ Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ Source0: %name-%{version}.tar.bz2 Source1: firmware.sh -Source2: iwlwifi-6000-4.ucode +Source2: iwlwifi-5000-5.ucode +Source3: iwlwifi-6000-4.ucode %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -70,7 +71,8 @@ bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} # fix older version of the iwlwifi firmware (bnc#653508) -cp ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware +install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-5000-5.ucode %{buildroot}/lib/firmware +install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware # create symlinks for Broadcom driver (bnc#673054) cd %{buildroot}/lib/firmware/brcm/ diff --git a/iwlwifi-5000-5.ucode b/iwlwifi-5000-5.ucode new file mode 100644 index 0000000..2de8584 --- /dev/null +++ b/iwlwifi-5000-5.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da259ae4b436f4d166aad2139f23694c2737e25288095140a1809d60fe676247 +size 340696 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index fcfa696..d5caf11 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Mar 20 20:15:56 CET 2011 - dmueller@suse.de + +- update intel 5000 firmware to version matching 2.6.38 + ------------------------------------------------------------------- Thu Mar 10 22:21:34 UTC 2011 - gregkh@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index aa6d0f2..63514ff 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -27,7 +27,8 @@ Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ Source0: %name-%{version}.tar.bz2 Source1: firmware.sh -Source2: iwlwifi-6000-4.ucode +Source2: iwlwifi-5000-5.ucode +Source3: iwlwifi-6000-4.ucode %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -70,7 +71,8 @@ bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} # fix older version of the iwlwifi firmware (bnc#653508) -cp ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware +install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-5000-5.ucode %{buildroot}/lib/firmware +install -m 644 ${RPM_SOURCE_DIR}/iwlwifi-6000-4.ucode %{buildroot}/lib/firmware # create symlinks for Broadcom driver (bnc#673054) cd %{buildroot}/lib/firmware/brcm/