Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13745
Modified Files:
wl-kmod.spec
Added Files:
broadcom-wl-5.100.82.112-cfg80211.patch
Log Message:
* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-4
- Added patch to build with CFG80211 API as default for F-17
broadcom-wl-5.100.82.112-cfg80211.patch:
Makefile | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- NEW FILE broadcom-wl-5.100.82.112-cfg80211.patch ---
diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/Makefile
hybrid-portsrc_x86_32-v5_100_82_112/Makefile
--- hybrid-portsrc_x86_32-v5_100_82_112.orig/Makefile 2011-10-22 18:56:55.000000000 +0200
+++ hybrid-portsrc_x86_32-v5_100_82_112/Makefile 2012-10-10 14:34:17.019295870 +0200
@@ -16,18 +16,18 @@
ifneq ($(KERNELRELEASE),)
LINUXVER_GOODFOR_CFG80211:=$(strip $(shell \
- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge
"6" -a "$(SUBLEVEL)" -ge "32" ]; then \
- echo TRUE; \
- else \
+ if [ "$(VERSION)" -le "2" -a "$(PATCHLEVEL)" -le
"6" -a "$(SUBLEVEL)" -lt "32" ]; then \
echo FALSE; \
+ else \
+ echo TRUE; \
fi \
))
LINUXVER_WEXT_ONLY:=$(strip $(shell \
- if [ "$(VERSION)" -ge "2" -a "$(PATCHLEVEL)" -ge
"6" -a "$(SUBLEVEL)" -ge "17" ]; then \
- echo FALSE; \
- else \
+ if [ "$(VERSION)" -le "2" -a "$(PATCHLEVEL)" -le
"6" -a "$(SUBLEVEL)" -lt "17" ]; then \
echo TRUE; \
+ else \
+ echo FALSE; \
fi \
))
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-18/wl-kmod.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- wl-kmod.spec 24 Jun 2012 09:55:51 -0000 1.64
+++ wl-kmod.spec 10 Oct 2012 17:13:23 -0000 1.65
@@ -3,11 +3,11 @@
# "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 akmod
+%define buildforkernels current
Name: wl-kmod
Version: 5.100.82.112
-Release: 3%{?dist}.1
+Release: 4%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,6 +18,7 @@
Patch0: broadcom-wl-5.100.82.112-license.patch
Patch1: broadcom-wl-5.100.82.112-kernel-3.2.patch
Patch2: broadcom-wl-5.100.82.112-kernel-3.4.patch
+Patch3: broadcom-wl-5.100.82.112-cfg80211.patch
BuildRequires: %{_bindir}/kmodtool
@@ -56,6 +57,7 @@
%patch0 -p1 -b .license
%patch1 -p1 -b .kernel-3.2
%patch2 -p1 -b .kernel-3.4
+%patch3 -p1 -b .cfg80211
popd
for kernel_version in %{?kernel_versions} ; do
@@ -85,6 +87,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 10 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-4
+- Added patch to build with CFG80211 API as default for F-17
+
* Sun Jun 24 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> -
5.100.82.112-3.1
- spec file cleanup