From 61697f35fe297da21e450c24f0d40be13fc1b8a4d995e285c2aaac7c08ebc711 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Tue, 22 Feb 2011 14:10:25 +0000 Subject: [PATCH 1/2] Accepting request 60136 from home:jobermayr:branches:Kernel:HEAD thx OBS-URL: https://build.opensuse.org/request/show/60136 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=25 --- _service | 13 +++ ...ess:tar_scm:kernel-firmware-2.6.38.tar.bz2 | 3 + _service:set_version:kernel-firmware.spec | 79 +++++++++++++++++++ kernel-firmware.changes | 5 ++ kernel-firmware.spec | 8 +- linux-firmware-20101214.tar.bz2 | 3 - 6 files changed, 104 insertions(+), 7 deletions(-) create mode 100644 _service create mode 100644 _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 create mode 100644 _service:set_version:kernel-firmware.spec delete mode 100644 linux-firmware-20101214.tar.bz2 diff --git a/_service b/_service new file mode 100644 index 0000000..f2eb916 --- /dev/null +++ b/_service @@ -0,0 +1,13 @@ + + + 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 new file mode 100644 index 0000000..f9e6a69 --- /dev/null +++ b/_service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dcca89ee081c8798aa36a7a76e99ef98cdc090d5d62d55a1f324c3e2764508c3 +size 25421395 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec new file mode 100644 index 0000000..78b2090 --- /dev/null +++ b/_service:set_version:kernel-firmware.spec @@ -0,0 +1,79 @@ +# +# spec file for package kernel-firmware (Version git) +# +# 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 +%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} + +%clean +rm -rf %{buildroot} + +%files +%defattr(0644,root,root,0755) +%doc WHENCE +/lib/firmware/* + +%changelog diff --git a/kernel-firmware.changes b/kernel-firmware.changes index 351afbe..9da33a6 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 5 13:56:23 UTC 2011 - johannesobermayr@gmx.de + +- Add scm service for automatical updates + ------------------------------------------------------------------- Wed Dec 15 22:34:12 UTC 2010 - gregkh@suse.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index f41c44c..ce905b9 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -1,7 +1,7 @@ # -# spec file for package kernel-firmware (Version 20100617) +# spec file for package kernel-firmware (Version git) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 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 @@ -25,7 +25,7 @@ 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: linux-firmware-%{version}.tar.bz2 +Source0: %name-%{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 -n linux-firmware-%{version} +%setup -q %build # nothing to do diff --git a/linux-firmware-20101214.tar.bz2 b/linux-firmware-20101214.tar.bz2 deleted file mode 100644 index 0fd46c7..0000000 --- a/linux-firmware-20101214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b170f60113d8fd316a181da96c87673c530d63b6cccc530ce21b98a01b7e4e0 -size 11366235 From 1f75215aa140e2f92723f2688b1bfb7fbb8e465ac419f31969c1e7b7298795af Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 24 Feb 2011 21:45:50 +0000 Subject: [PATCH 2/2] Accepting request 62754 from home:gregkh:branches:Kernel:HEAD OBS-URL: https://build.opensuse.org/request/show/62754 OBS-URL: https://build.opensuse.org/package/show/Kernel:HEAD/kernel-firmware?expand=0&rev=26 --- _service:recompress:tar_scm:kernel-firmware-2.6.38.tar.bz2 | 4 ++-- _service:set_version:kernel-firmware.spec | 5 +++++ kernel-firmware.changes | 5 +++++ kernel-firmware.spec | 5 +++++ 4 files changed, 17 insertions(+), 2 deletions(-) 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 f9e6a69..604d068 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:dcca89ee081c8798aa36a7a76e99ef98cdc090d5d62d55a1f324c3e2764508c3 -size 25421395 +oid sha256:68a94a9434a853cc3cefac643728f1ce5adfd748df20fa948e84c5c77939917d +size 27012224 diff --git a/_service:set_version:kernel-firmware.spec b/_service:set_version:kernel-firmware.spec index 78b2090..93cac4c 100644 --- a/_service:set_version:kernel-firmware.spec +++ b/_service:set_version:kernel-firmware.spec @@ -68,6 +68,11 @@ 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/kernel-firmware.changes b/kernel-firmware.changes index 9da33a6..5d12ffa 100644 --- a/kernel-firmware.changes +++ b/kernel-firmware.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 24 21:40:58 UTC 2011 - gregkh@suse.de + +- create symlinks for Broadcom driver (bnc#673054) + ------------------------------------------------------------------- Sat Feb 5 13:56:23 UTC 2011 - johannesobermayr@gmx.de diff --git a/kernel-firmware.spec b/kernel-firmware.spec index ce905b9..c87b066 100644 --- a/kernel-firmware.spec +++ b/kernel-firmware.spec @@ -68,6 +68,11 @@ 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}