11:41 p.m.
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2448
Modified Files:
.cvsignore broadcom-wl-blacklist.conf broadcom-wl.spec sources
Added Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
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/broadcom-wl/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 1 Feb 2011 22:29:12 -0000 1.9
+++ .cvsignore 3 Nov 2011 23:41:40 -0000 1.10
@@ -1,3 +1,5 @@
+hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
README.txt
+bcma.txt
broadcom-wl-blacklist.conf
Index: broadcom-wl-blacklist.conf
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl-blacklist.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-blacklist.conf 19 Sep 2009 12:52:18 -0000 1.1
+++ broadcom-wl-blacklist.conf 3 Nov 2011 23:41:40 -0000 1.2
@@ -3,3 +3,4 @@
blacklist ssb
blacklist b43
blacklist ndiswrapper
+blacklist bcma
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- broadcom-wl.spec 1 Feb 2011 22:29:12 -0000 1.10
+++ broadcom-wl.spec 3 Nov 2011 23:41:40 -0000 1.11
@@ -5,29 +5,35 @@
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_100_82_38...
-Source1: http://www.broadcom.com/docs/linux_sta/README.txt
-Source2: broadcom-wl-blacklist.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+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...
+Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source3: broadcom-wl-blacklist.conf
+Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
+Patch0: broadcom-wl-5.100.82.38-license.patch
+Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
BuildArch: noarch
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
-ExcludeArch: ppc ppc64
+ExcludeArch: ppc ppc64
%description
-This package contains the license, readme and configuration files
-for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
-driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and
-BCM4322-based hardware.
+This package contains the license, README.txt and configuration
+files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
+device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
+BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
+BCM43228-based hardware.
%prep
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
-cp -p %{SOURCE1} .
-chmod 644 lib/LICENSE.txt README.txt
+cp -p %{SOURCE2} %{SOURCE4} .
+chmod 644 lib/LICENSE.txt README.txt bcma.txt
+%patch0 -p1 -b .license
+%patch1 -p0 -b .init_MUTEX
%build
echo "Nothing to build."
@@ -35,17 +41,20 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
-install -p -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt
+%doc lib/LICENSE.txt README.txt bcma.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.38-1
+- Updated version to 5.100.82.38
+
* Tue Feb 01 2011 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36
- updated version to 5.100.82.38
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 1 Feb 2011 22:29:12 -0000 1.9
+++ sources 3 Nov 2011 23:41:40 -0000 1.10
@@ -1,3 +1,5 @@
+cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
24976921c7b8854ed2cd56fbc5b1c13c README.txt
-5eb025e4c25f9fdaa7ae809652c66173 broadcom-wl-blacklist.conf
+521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
+5a38b3910b18d96922b769746bf2d3ee broadcom-wl-blacklist.conf