Author: nvieville Update of /cvs/nonfree/rpms/wl-kmod/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28775 Modified Files: wl-kmod.spec Added Files: wl-kmod-005_devinit_late.patch Log Message: * Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.141-2 - Added late patch for __devinit since kernel 3.8 wl-kmod-005_devinit_late.patch: linuxver.h | 4 ++++ 1 file changed, 4 insertions(+) --- NEW FILE wl-kmod-005_devinit_late.patch --- diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h --- hybrid-v35_64-nodebug-pcoem-6_30_223_141.orig/src/include/linuxver.h 2013-08-01 08:52:22.000000000 +0200 +++ hybrid-v35_64-nodebug-pcoem-6_30_223_141/src/include/linuxver.h 2014-07-02 18:36:28.616225432 +0200 @@ -169,8 +169,12 @@ #define __devexit #endif #ifndef __devinit +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) +#define __devinit +#else #define __devinit __init #endif +#endif #ifndef __devinitdata #define __devinitdata #endif Index: wl-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/wl-kmod/F-19/wl-kmod.spec,v retrieving revision 1.127 retrieving revision 1.128 diff -u -r1.127 -r1.128 --- wl-kmod.spec 8 Jul 2014 11:36:04 -0000 1.127 +++ wl-kmod.spec 8 Jul 2014 19:40:57 -0000 1.128 @@ -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 -%global buildforkernels newest +%global buildforkernels current Name: wl-kmod Version: 6.30.223.141 -Release: 1%{?dist}.35 +Release: 2%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -19,6 +19,7 @@ Patch1: wl-kmod-002_wext_workaround.patch Patch2: wl-kmod-003_kernel_3.8.patch Patch3: wl-kmod-004_kernel_3.10.patch +Patch4: wl-kmod-005_devinit_late.patch BuildRequires: %{_bindir}/kmodtool @@ -61,6 +62,7 @@ %patch1 -p1 -b .wext_workaround.patch %patch2 -p1 -b .kernel-3.8 %patch3 -p1 -b .kernel-3.10 +%patch4 -p1 -b .devinit_late popd for kernel_version in %{?kernel_versions} ; do @@ -90,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jul 08 2014 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.141-2 +- Added late patch for __devinit since kernel 3.8 + * Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 6.30.223.141-1.35 - Rebuilt for kernel