Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-15 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19460 Modified Files: wl-kmod.spec Added Files: broadcom-wl-5.100.82.112-kernel-3.4.patch Log Message: * Wed Jun 13 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-2 - Added patch to build for kernel >= 3.4 broadcom-wl-5.100.82.112-kernel-3.4.patch: wl_linux.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE broadcom-wl-5.100.82.112-kernel-3.4.patch --- diff -Naur hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c --- hybrid-portsrc_x86_32-v5_100_82_112.orig/src/wl/sys/wl_linux.c 2012-01-09 15:07:19.779120052 +0100 +++ hybrid-portsrc_x86_32-v5_100_82_112/src/wl/sys/wl_linux.c 2012-06-08 19:33:56.732583669 +0200 @@ -40,7 +40,9 @@ #include <linux/pci_ids.h> #define WLC_MAXBSSCFG 1 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0) #include <asm/system.h> +#endif #include <asm/io.h> #include <asm/irq.h> #include <asm/pgtable.h> Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- wl-kmod.spec 5 Jun 2012 20:40:49 -0000 1.95 +++ wl-kmod.spec 13 Jun 2012 07:46:56 -0000 1.96 @@ -3,13 +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 newest -%define buildforkernels newest -%define buildforkernels newest +%define buildforkernels current Name: wl-kmod Version: 5.100.82.112 -Release: 1%{?dist}.21 +Release: 2%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -19,6 +17,7 @@ Source11: broadcom-wl-kmodtool-excludekernel-filterfile 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 BuildRequires: %{_bindir}/kmodtool @@ -56,6 +55,7 @@ %endif %patch0 -p1 -b .license %patch1 -p1 -b .kernel-3.2 +%patch2 -p1 -b .kernel-3.4 popd for kernel_version in %{?kernel_versions} ; do @@ -85,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 13 2012 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-2 +- Added patch to build for kernel >= 3.4 + * Tue Jun 05 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 5.100.82.112-1.21 - Rebuilt for updated kernel