Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv9788 Modified Files: .cvsignore sources wl-kmod.spec Added Files: 5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch Removed Files: broadcom-wl-5.60.48.36-2.6.33-kernel.patch broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch broadcom-wl-5.60.48.36-license.patch broadcom-wl-5.60.48.36-multicast-kernel.patch Log Message: * Thu Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1 - Updated version to 5.100.82.38 5_100_82_38.patch: wl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE 5_100_82_38.patch --- # # Patch for Broadcom 80211 (STA) driver 5.100.82.38 # Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels. # If you were able to compile, you don't need this patch. # To apply: # cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile) # patch -p0 < this_file # make # --- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700 +++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700 @@ -481,9 +481,9 @@ if (WL_ALL_PASSIVE_ENAB(wl)) { #ifdef WL_ALL_PASSIVE spin_lock_init(&wl->txq_lock); #endif - init_MUTEX(&wl->sem); + sema_init(&wl->sem, 1); } if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, osh, wl->regsva, wl->bcm_bustype, btparam, &err))) { broadcom-wl-5.100.82.38-license.patch: wl_linux.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE broadcom-wl-5.100.82.38-license.patch --- diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c --- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000 +++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000 @@ -180,6 +180,8 @@ static void wl_report_radio_state(wl_info_t *wl); #endif +MODULE_LICENSE("MIXED/Proprietary"); + static struct pci_device_id wl_id_table[] = { { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Feb 2010 23:03:46 -0000 1.9 +++ .cvsignore 4 Nov 2011 00:42:42 -0000 1.10 @@ -1,3 +1,3 @@ -hybrid-portsrc-x86_32-v5.60.48.36.tar.gz -hybrid-portsrc-x86_64-v5.60.48.36.tar.gz +hybrid-portsrc_x86_64-v5_100_82_38.tar.gz +hybrid-portsrc_x86_32-v5_100_82_38.tar.gz broadcom-wl-kmodtool-excludekernel-filterfile Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Feb 2010 23:03:46 -0000 1.9 +++ sources 4 Nov 2011 00:42:47 -0000 1.10 @@ -1,3 +1,3 @@ -0466d863405e1ab99d5e288fe886e852 hybrid-portsrc-x86_32-v5.60.48.36.tar.gz -a78095ddcc30a191f64dccbc31b84de8 hybrid-portsrc-x86_64-v5.60.48.36.tar.gz +cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz +c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz 5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- wl-kmod.spec 2 Nov 2011 10:18:48 -0000 1.63 +++ wl-kmod.spec 4 Nov 2011 00:42:47 -0000 1.64 @@ -3,28 +3,27 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%define buildforkernels newest +#define buildforkernels newest +%define buildforkernels current +#define buildforkernels akmods Name: wl-kmod -Version: 5.60.48.36 -Release: 2%{?dist}.12 -Summary: Kernel module for broadcom wireless devices +Version: 5.100.82.38 +Release: 1%{?dist} +Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted URL: http://www.broadcom.com/support/802.11/linux_sta.php -Source0: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_32-v5.60.48.36.... -Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.60.48.36.... +Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h... +Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h... Source11: broadcom-wl-kmodtool-excludekernel-filterfile -Patch0: broadcom-wl-5.60.48.36-license.patch -Patch1: broadcom-wl-5.60.48.36-2.6.33-kernel.patch -Patch2: broadcom-wl-5.60.48.36-multicast-kernel.patch -Patch3: broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: broadcom-wl-5.100.82.38-license.patch +Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5... BuildRequires: %{_bindir}/kmodtool # needed for plague to make sure it builds for i586 and i686 -ExclusiveArch: i686 x86_64 +ExclusiveArch: i686 x86_64 # ppc disabled because broadcom only provides x86 and x86_64 bits %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } @@ -33,9 +32,9 @@ %{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description -These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device -driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and BCM4322 -based hardware. +These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device +driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-, +BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware. NOTE: You must read the LICENSE.txt file in the docs directory before using this software. @@ -56,9 +55,7 @@ tar xzf %{SOURCE1} %endif %patch0 -p1 -b .license -%patch1 -p0 -b .kernel -%patch2 -p0 -b .multicast -%patch3 -p0 -b .lockdep +%patch1 -p0 -b .init_MUTEX popd for kernel_version in %{?kernel_versions} ; do @@ -77,17 +74,20 @@ for kernel_version in %{?kernel_versions}; do pushd _kmod_build_${kernel_version%%___*} mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} - install -m 644 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} + install -m 755 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} popd done -chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* || : +chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/*/* || : %{?akmod_install} %clean rm -rf $RPM_BUILD_ROOT %changelog +* Thu Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1 +- Updated version to 5.100.82.38 + * Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.12 - rebuild for updated kernel --- broadcom-wl-5.60.48.36-2.6.33-kernel.patch DELETED --- --- broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch DELETED --- --- broadcom-wl-5.60.48.36-license.patch DELETED --- --- broadcom-wl-5.60.48.36-multicast-kernel.patch DELETED ---