From d69888e11bbb3418c461b691db48b0c2b999a91c47c6dba45429f6ff68d09070 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 25 Feb 2011 09:27:16 +0000 Subject: [PATCH 1/6] Updating link to change in openSUSE:Factory/kernel-firmware revision 18.0 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=6931043c698524012a7bed8a1bc9430d --- kernel-firmware.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel-firmware.spec b/kernel-firmware.spec index c87b066..a5fb22a 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-firmware (Version git) +# spec file for package kernel-firmware # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: kernel-firmware BuildRequires: fdupes kernel-default Version: 20101214 -Release: 1 +Release: 6 Summary: Linux kernel firmware files License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) Group: System/Kernel From d28b4f23a6ff030ad616f143bb88e845a611c86a12aa5f84b333f3cf8f88d2e3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 10 Mar 2011 23:50:53 +0000 Subject: [PATCH 2/6] Accepting request 63950 from home:gregkh:branches:Kernel:HEAD OBS-URL: https://build.opensuse.org/request/show/63950 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=28 --- .gitattributes | 2 ++ _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 | 4 ++-- _service:set_version:kernel-firmware.spec | 6 +++++- iwlwifi-6000-4.ucode | 3 +++ kernel-firmware.changes | 5 +++++ kernel-firmware.spec | 4 ++++ 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 iwlwifi-6000-4.ucode diff --git a/.gitattributes b/.gitattributes index 9b03811..405dd3a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,3 +21,5 @@ *.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 +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 604d068..b46d78d 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:68a94a9434a853cc3cefac643728f1ce5adfd748df20fa948e84c5c77939917d -size 27012224 +oid sha256:daa63b7397127c644ed2aa92644f262aa604873fb16b288bac7f829f1c27d5fa +size 26719539 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec index 93cac4c..0ba61b9 100644 --- a/_service:set_version:kernel-firmware.spec +++ b/_service:set_version:kernel-firmware.spec @@ -1,5 +1,5 @@ # -# spec file for package kernel-firmware (Version git) +# spec file for package kernel-firmware # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,6 +27,7 @@ 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 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -68,6 +69,9 @@ rm -f %{buildroot}/lib/firmware/WHENCE 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 + # create symlinks for Broadcom driver (bnc#673054) cd %{buildroot}/lib/firmware/brcm/ ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw diff --git a/iwlwifi-6000-4.ucode b/iwlwifi-6000-4.ucode new file mode 100644 index 0000000..00d127f --- /dev/null +++ b/iwlwifi-6000-4.ucode @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5babe59eda1022a45b2ae0460e13302eff0b3575b776e86fa68e50dfce62f94f +size 454608 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 5d12ffa..fcfa696 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 10 22:21:34 UTC 2011 - gregkh@suse.de + +- update intel 6300 firmware to newer version (bnc#653508) + ------------------------------------------------------------------- Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index a5fb22a..aa6d0f2 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -27,6 +27,7 @@ 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 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -68,6 +69,9 @@ rm -f %{buildroot}/lib/firmware/WHENCE 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 + # create symlinks for Broadcom driver (bnc#673054) cd %{buildroot}/lib/firmware/brcm/ ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw From aebca233c8002ccc04071dac348b0589b8e3001048f34c9a2c162f87d7f03796 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 20 Mar 2011 20:16:49 +0000 Subject: [PATCH 3/6] 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/ From ccfa707b1e0fa8d6068bdeb173f2307b7aea75a6053570ec5ec6f98f3fce59a3 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Tue, 12 Jul 2011 14:57:29 +0000 Subject: [PATCH 4/6] Accepting request 76122 from home:michal-m:branches:Kernel:HEAD - Revert the workaround for bnc#673054, the files exist in the tarball now. - Fix firmware.sh for 3.0 OBS-URL: https://build.opensuse.org/request/show/76122 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=30 --- ...ess:tar_scm:kernel-firmware-2.6.38.tar.bz2 | 3 - _service:set_version:kernel-firmware.spec | 90 ------------------- firmware.sh | 2 +- kernel-firmware.changes | 11 +++ kernel-firmware.spec | 5 -- 5 files changed, 12 insertions(+), 99 deletions(-) delete mode 100644 _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 delete mode 100644 _service:set_version:kernel-firmware.spec 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 deleted file mode 100644 index 732c502..0000000 --- a/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2e7832fed93bf563d200469daae7794336119f69f7fbc3396bf4e6b7c0a754f -size 26893995 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec deleted file mode 100644 index 28444e3..0000000 --- a/_service:set_version:kernel-firmware.spec +++ /dev/null @@ -1,90 +0,0 @@ -# -# spec file for package kernel-firmware -# -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - - -Name: kernel-firmware -BuildRequires: fdupes kernel-default -Version: 2.6.38 -Release: 0 -Summary: Linux kernel firmware files -License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) -Group: System/Kernel -Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ -Source0: %name-%{version}.tar.bz2 -Source1: firmware.sh -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 -Provides: qlogic-firmware -Obsoletes: qlogic-firmware -Provides: cxgb3-firmware -Obsoletes: cxgb3-firmware -Provides: ralink-firmware -Obsoletes: ralink-firmware -Provides: iwl1000-ucode -Obsoletes: iwl1000-ucode -Provides: iwl3945-ucode -Obsoletes: iwl3945-ucode -Provides: iwl4965-ucode -Obsoletes: iwl4965-ucode -Provides: iwl5000-ucode -Obsoletes: iwl5000-ucode -Provides: iwl5150-ucode -Obsoletes: iwl5150-ucode -AutoReq: off - -%description -This package contains the firmware for in-kernel drivers that was -previously included in the kernel. It is shared by all kernels >= -2.6.27-rc1. - - - -%prep -%setup -q - -%build -# nothing to do - -%install -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/ -%fdupes %{buildroot} - -# fix older version of the iwlwifi firmware (bnc#653508) -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/ -ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw -ln -s bcm43xx_hdr-0-610-809-0.fw bcm43xx_hdr-0.fw - -%clean -rm -rf %{buildroot} - -%files -%defattr(0644,root,root,0755) -%doc WHENCE -/lib/firmware/* - -%changelog diff --git a/firmware.sh b/firmware.sh index 4abc757..7d33340 100644 --- a/firmware.sh +++ b/firmware.sh @@ -24,7 +24,7 @@ get_kernel_dir() head -n1 | cut -d' ' -f 2) if test -n "$pkg"; then kernel=$(rpm -ql "$pkg" | \ - grep -m1 '^/lib/modules/2\.6\.[^/]*/kernel$') + grep -m1 '^/lib/modules/[2-9][^/]*/kernel$') fi if test -d "$kernel"; then return diff --git a/kernel-firmware.changes b/kernel-firmware.changes index d5caf11..7214450 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 12 13:32:17 UTC 2011 - mmarek@novell.com + +- Revert the workaround for bnc#673054, the files exist in the + tarball now. + +------------------------------------------------------------------- +Tue Jul 12 13:16:03 UTC 2011 - mmarek@novell.com + +- Fix firmware.sh for 3.0 + ------------------------------------------------------------------- Sun Mar 20 20:15:56 CET 2011 - dmueller@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index 63514ff..f34f5d0 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -74,11 +74,6 @@ bash %_sourcedir/firmware.sh --kill-duplicates %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/ -ln -s bcm43xx-0-610-809-0.fw bcm43xx-0.fw -ln -s bcm43xx_hdr-0-610-809-0.fw bcm43xx_hdr-0.fw - %clean rm -rf %{buildroot} From 083cf7865dffa03a82d8348b996b40e03627d1449bb4b63d39a6da92ec8049ee Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 20 Jul 2011 11:45:46 +0000 Subject: [PATCH 5/6] Accepting request 76265 from home:dirkmueller:branches:openSUSE:11.4:Update:Test MAINTAINERS PLEASE FORWARD TO OPENSUSE FACTORY THE VERSION THERE IS STONE AGE!!!! - update to 20110709: * provides more stable iwlwifi drivers * remove the need for symlinking bcm43xx-0.fw OBS-URL: https://build.opensuse.org/request/show/76265 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=31 --- .gitattributes | 3 --- _service | 13 ------------- firmware.sh | 2 +- iwlwifi-5000-5.ucode | 3 --- iwlwifi-6000-4.ucode | 3 --- kernel-firmware.changes | 22 ++++------------------ kernel-firmware.spec | 14 ++++---------- linux-firmware-20110709.tar.bz2 | 3 +++ 8 files changed, 12 insertions(+), 51 deletions(-) delete mode 100644 _service delete mode 100644 iwlwifi-5000-5.ucode delete mode 100644 iwlwifi-6000-4.ucode create mode 100644 linux-firmware-20110709.tar.bz2 diff --git a/.gitattributes b/.gitattributes index cf9c256..9b03811 100644 --- a/.gitattributes +++ b/.gitattributes @@ -21,6 +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 -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 b/_service deleted file mode 100644 index f2eb916..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git - 2.6.38 - kernel-firmware - - - *.tar - bz2 - - - diff --git a/firmware.sh b/firmware.sh index 7d33340..4abc757 100644 --- a/firmware.sh +++ b/firmware.sh @@ -24,7 +24,7 @@ get_kernel_dir() head -n1 | cut -d' ' -f 2) if test -n "$pkg"; then kernel=$(rpm -ql "$pkg" | \ - grep -m1 '^/lib/modules/[2-9][^/]*/kernel$') + grep -m1 '^/lib/modules/2\.6\.[^/]*/kernel$') fi if test -d "$kernel"; then return diff --git a/iwlwifi-5000-5.ucode b/iwlwifi-5000-5.ucode deleted file mode 100644 index 2de8584..0000000 --- a/iwlwifi-5000-5.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da259ae4b436f4d166aad2139f23694c2737e25288095140a1809d60fe676247 -size 340696 diff --git a/iwlwifi-6000-4.ucode b/iwlwifi-6000-4.ucode deleted file mode 100644 index 00d127f..0000000 --- a/iwlwifi-6000-4.ucode +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5babe59eda1022a45b2ae0460e13302eff0b3575b776e86fa68e50dfce62f94f -size 454608 diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 7214450..caa086a 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,23 +1,9 @@ ------------------------------------------------------------------- -Tue Jul 12 13:32:17 UTC 2011 - mmarek@novell.com +Thu Jul 14 19:32:48 CEST 2011 - dmueller@suse.de -- Revert the workaround for bnc#673054, the files exist in the - tarball now. - -------------------------------------------------------------------- -Tue Jul 12 13:16:03 UTC 2011 - mmarek@novell.com - -- Fix firmware.sh for 3.0 - -------------------------------------------------------------------- -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 - -- update intel 6300 firmware to newer version (bnc#653508) +- update to 20110709: + * provides more stable iwlwifi drivers + * remove the need for symlinking bcm43xx-0.fw ------------------------------------------------------------------- Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index f34f5d0..afb59d5 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,16 +19,14 @@ Name: kernel-firmware BuildRequires: fdupes kernel-default -Version: 20101214 -Release: 6 +Version: 20110709 +Release: 1 Summary: Linux kernel firmware files License: NON-OSI-COMPLIANT(no modification) ; GPLv2 ; GPLv2+ ; MIT License (or similar) Group: System/Kernel Url: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/ -Source0: %name-%{version}.tar.bz2 +Source0: ftp://ftp.kernel.org/pub/linux/kernel/people/dwmw2/firmware/linux-firmware-%{version}.tar.bz2 Source1: firmware.sh -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 @@ -58,7 +56,7 @@ previously included in the kernel. It is shared by all kernels >= %prep -%setup -q +%setup -q -n linux-firmware-%version %build # nothing to do @@ -70,10 +68,6 @@ rm -f %{buildroot}/lib/firmware/WHENCE bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} -# fix older version of the iwlwifi firmware (bnc#653508) -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 - %clean rm -rf %{buildroot} diff --git a/linux-firmware-20110709.tar.bz2 b/linux-firmware-20110709.tar.bz2 new file mode 100644 index 0000000..d084b8b --- /dev/null +++ b/linux-firmware-20110709.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f1b61c5ef9b9bd34eff2296dc40a4732939e687ef80f3d0e749f58e4a1990134 +size 15267126 From a429ae53cc3b529a278a048a194fcc26343fc60b945f64589e3f7df1198aca10 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Wed, 20 Jul 2011 12:34:35 +0000 Subject: [PATCH 6/6] - Revert the workaround for bnc#673054, the files exist in the tarball now. - Fix firmware.sh for 3.0 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=32 --- firmware.sh | 2 +- kernel-firmware.changes | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/firmware.sh b/firmware.sh index 4abc757..7d33340 100644 --- a/firmware.sh +++ b/firmware.sh @@ -24,7 +24,7 @@ get_kernel_dir() head -n1 | cut -d' ' -f 2) if test -n "$pkg"; then kernel=$(rpm -ql "$pkg" | \ - grep -m1 '^/lib/modules/2\.6\.[^/]*/kernel$') + grep -m1 '^/lib/modules/[2-9][^/]*/kernel$') fi if test -d "$kernel"; then return diff --git a/kernel-firmware.changes b/kernel-firmware.changes index caa086a..6ae63b2 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -5,6 +5,17 @@ Thu Jul 14 19:32:48 CEST 2011 - dmueller@suse.de * provides more stable iwlwifi drivers * remove the need for symlinking bcm43xx-0.fw +------------------------------------------------------------------- +Tue Jul 12 13:32:17 UTC 2011 - mmarek@novell.com + +- Revert the workaround for bnc#673054, the files exist in the + tarball now. + +------------------------------------------------------------------- +Tue Jul 12 13:16:03 UTC 2011 - mmarek@novell.com + +- Fix firmware.sh for 3.0 + ------------------------------------------------------------------- Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de