From ccfa707b1e0fa8d6068bdeb173f2307b7aea75a6053570ec5ec6f98f3fce59a3 Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Tue, 12 Jul 2011 14:57:29 +0000 Subject: [PATCH] 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}