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/_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 604d068..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:68a94a9434a853cc3cefac643728f1ce5adfd748df20fa948e84c5c77939917d -size 27012224 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec deleted file mode 100644 index 5ec44ab..0000000 --- a/_service:set_version:kernel-firmware.spec +++ /dev/null @@ -1,84 +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: 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 -Source1: firmware.sh -%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} - -# 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 5d12ffa..6ae63b2 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jul 14 19:32:48 CEST 2011 - dmueller@suse.de + +- update to 20110709: + * 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 diff --git a/kernel-firmware.spec b/kernel-firmware.spec index a5fb22a..afb59d5 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -19,13 +19,13 @@ 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 %define __find_supplements bash %_sourcedir/firmware.sh --find-supplements BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,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 @@ -68,11 +68,6 @@ rm -f %{buildroot}/lib/firmware/WHENCE bash %_sourcedir/firmware.sh --kill-duplicates %buildroot/lib/firmware/ %fdupes %{buildroot} -# 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} 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