Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-16 In directory se02.es.rpmfusion.net:/tmp/cvs-serv3340 Modified Files: .cvsignore Added Files: 5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch sources wl-kmod.spec Removed Files: dead.package Log Message: * Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1.1 - Rebuilt for F-16 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: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 5 Nov 2011 00:14:20 -0000 1.11 @@ -0,0 +1,3 @@ +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: wl-kmod.spec diff -N wl-kmod.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wl-kmod.spec 5 Nov 2011 00:14:20 -0000 1.55 @@ -0,0 +1,281 @@ +# buildforkernels macro hint: when you build a new version or a new release +# that contains bugfixes or other improvements then you must disable the +# "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 current +#define buildforkernels akmods + +Name: wl-kmod +Version: 5.100.82.38 +Release: 1%{?dist}.1 +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://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.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 +# ppc disabled because broadcom only provides x86 and x86_64 bits + +%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } + +# kmodtool does its magic here +%{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-, 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. + +%prep +# error out if there was something wrong with kmodtool +%{?kmodtool_check} + +# print kmodtool output for debugging purposes: +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null + +%setup -q -c -T +mkdir %{name}-%{version}-src +pushd %{name}-%{version}-src +%ifarch %{ix86} + tar xzf %{SOURCE0} +%else + tar xzf %{SOURCE1} +%endif +%patch0 -p1 -b .license +%patch1 -p0 -b .init_MUTEX +popd + +for kernel_version in %{?kernel_versions} ; do + cp -a %{name}-%{version}-src _kmod_build_${kernel_version%%___*} +done + +%build +for kernel_version in %{?kernel_versions}; do + pushd _kmod_build_${kernel_version%%___*} + make -C ${kernel_version##*___} M=`pwd` modules + popd +done + +%install +rm -rf ${RPM_BUILD_ROOT} +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 755 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} + popd +done + +chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/*/* || : +%{?akmod_install} + +%clean +rm -rf $RPM_BUILD_ROOT + +%changelog +* Sat Nov 05 2011 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1.1 +- Rebuilt for F-16 + +* 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 + +* Sun Oct 30 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.11 +- rebuild for updated kernel + +* Wed Oct 19 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.10 +- rebuild for updated kernel + +* Fri Oct 07 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.9 +- rebuild for updated kernel + +* Sat Sep 03 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.8 +- rebuild for updated kernel + +* Wed Aug 17 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.7 +- rebuild for updated kernel + +* Sun Jul 31 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.6 +- rebuild for updated kernel + +* Tue Jul 12 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.60.48.36-2.5 +- Rebuild for updated kernel + +* Wed Jun 15 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.4 +- rebuild for updated kernel + +* Sat Jun 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.3 +- rebuild for updated kernel + +* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.2 +- rebuild for updated kernel + +* Sat May 28 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.60.48.36-2.1 +- rebuild for F15 release kernel + +* Sun Sep 26 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.60.48.36-2 +- added patch for kernel > 2.6.33 +- added multicast kernel patch +- added bogus debug_lockdep_rcu_enabled patch + +* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.60.48.36-1 +- Updated version to 5.60.48.36 + +* Tue Feb 09 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-4 +- added patch for linux kernel 2.6.32 + +* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.7 +- rebuild for new kernel, disable i586 builds + +* Tue Nov 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.6 +- rebuild for F12 release kernel + +* Mon Nov 09 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.5 +- rebuild for new kernels + +* Fri Nov 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.4 +- rebuild for new kernels + +* Wed Nov 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.3 +- rebuild for new kernels + +* Sat Oct 24 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.2 +- rebuild for new kernels + +* Wed Oct 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.91.9.3-3.1 +- rebuild for new kernels + +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-3 +- fixed licence patch + +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-2 +- new licence patch + +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3-1 +- updated to 5.10.91.9.3 + +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9-1 +- updated to 5.10.91.9 + +* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.9 +- rebuild for final F11 kernel + +* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.8 +- rebuild for new kernels + +* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.7 +- rebuild for new kernels + +* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.6 +- rebuild for new kernels + +* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.5 +- rebuild for new kernels + +* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.4 +- rebuild for new kernels + +* Sat May 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.3 +- rebuild for new kernels + +* Sun Apr 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.2 +- rebuild for new kernels + +* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2.1 +- rebuild for new kernels + +* Sat Mar 28 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.79.10-2 +- repatched to load lib80211_crypt_tkip module - bug #466 + +* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.79.10-1 +- update version to 5.10.79.10 + +* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-1.2 +- rebuild for latest Fedora kernel; + +* Tue Feb 03 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.14-1.1 +- rebuilt + +* Sun Feb 01 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.27.14-1 +- update version to 5.10.27.14 +- added patch to build against 2.6.29 kernel + +* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.4 +- rebuild for latest Fedora kernel; + +* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.3 +- rebuild for latest Fedora kernel; + +* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.2 +- rebuild for latest Fedora kernel; + +* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.12-1.1 +- rebuild for latest Fedora kernel; + +* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.27.12-1 +- Update version to 5.10.27.12 +- Remove vlanmode and build patches + +* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.27.11-1.2 +- added patch for building on 2.6.29 kernel + +* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.11-1.1 +- rebuild for latest Fedora kernel; + +* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.11-1 +- Update version to 5.10.27.11 + +* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.8 +- rebuild for latest Fedora kernel; + +* Sun Dec 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.7 +- rebuild for latest Fedora kernel; + +* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.6 +- rebuild for latest Fedora kernel; + +* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.5 +- rebuild for latest Fedora kernel; + +* Wed Nov 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.4 +- rebuild for latest Fedora kernel; + +* Tue Nov 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.3 +- rebuild for latest Fedora kernel; + +* Fri Nov 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.2 +- rebuild for latest Fedora kernel; + +* Sun Nov 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-5.1 +- rebuild for latest Fedora kernel; + +* Sat Nov 08 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-5 +- Fixed incorrect use of /usr/src/kernels/${kernel_version%%___*} + +* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-4 +- Just a spec file tidy up, nothing new + +* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-3 +- Moved userland package broadcom-wl into separate package + +* Mon Oct 27 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-2 +- Patch to fix vlanmode issue which prevents SSH connections when the driver is used. +- Changed kmod name to wl-kmod as per convention +- Added userland package broadcom-wl which provides kmod-wl-common which contains the required license doc + +* Sat Oct 25 2008 Jarod Wilson <jarod(a)wilsonet.com&gt; 5.10.27.6-1 +- Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-16/.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 5 Nov 2011 00:14:20 -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 --- dead.package DELETED ---