Author: thl Update of /cvs/free/rpms/staging-kmod/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14169 Modified Files: .cvsignore sources staging-kmod.spec Log Message: resync with F20, now that F19 got 3.13 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-19/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 20 Dec 2013 21:13:10 -0000 1.11 +++ .cvsignore 1 Mar 2014 10:11:34 -0000 1.12 @@ -1 +1 @@ -linux-staging-3.12.6.tar.bz2 +linux-staging-3.13.3.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-19/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Dec 2013 21:13:10 -0000 1.11 +++ sources 1 Mar 2014 10:11:35 -0000 1.12 @@ -1 +1 @@ -e3bdfe68ef360a896bdb8a476641f1bf linux-staging-3.12.6.tar.bz2 +4c40fdafc1d58c7a8b454f4b3085f1d2 linux-staging-3.13.3.tar.xz Index: staging-kmod.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-19/staging-kmod.spec,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- staging-kmod.spec 26 Feb 2014 08:42:26 -0000 1.68 +++ staging-kmod.spec 1 Mar 2014 10:11:35 -0000 1.69 @@ -1,9 +1,12 @@ # akmods not supported # which drivers to built -%global stgdrvs BCM_WIMAX DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8187SE R8188EU RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZRAM ZSMALLOC +%global stgdrvs BCM_WIMAX DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8187SE R8188EU RTL8192U RTS5139 SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2 ZRAM ZSMALLOC +%ifnarch %{arm} +%global stgdrvs %{stgdrvs} SLICOSS +%endif -# fixme: DVB_AS102 DVB_CXD2099 +# fixme: DVB_AS102 DVB_CXD2099 # avoid this error: # /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character @@ -21,15 +24,15 @@ #global prever rc8 Name: staging-kmod -Version: 3.12.6 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.11 +Version: 3.13.3 +Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.4 Summary: Selected kernel modules from linux-staging Group: System Environment/Kernel License: GPLv2 URL: http://www.kernel.org/ # a script to create this archive is part of staging-kmod-addons -Source0: linux-staging-%{version}%{?prever:-%{prever}}.tar.bz2 +Source0: linux-staging-%{version}%{?prever:-%{prever}}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: %{_bindir}/kmodtool @@ -52,7 +55,10 @@ %setup -q -c -T -a 0 # disable drivers that are enabled in Fedora's kernel, as those otherweise would get build -sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; ' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile') +sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; /.IMX/ d; /.DWC2/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile') + +# broken in 3.13 +sed -i 's!#include "dot11d.h"!#include "ieee80211/dot11d.h"!' linux-staging-%{version}/drivers/staging/rtl8192u/{r8192U_core.c,r8192U_wx.c,r819xU_phy.c} # seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for for kernel_version in %{?kernel_versions} ; do @@ -60,6 +66,7 @@ done + %build for kernel_version in %{?kernel_versions}; do oldcount=0 @@ -142,35 +149,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Wed Feb 26 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.11 -- Rebuilt for kernel - -* Mon Feb 24 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.10 -- Rebuilt for kernel - -* Thu Feb 20 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.9 -- Rebuilt for kernel - -* Sat Feb 15 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.8 -- Rebuilt for kernel - -* Fri Feb 07 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.7 -- Rebuilt for kernel - -* Thu Jan 30 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.6 -- Rebuilt for kernel - -* Tue Jan 28 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.5 -- Rebuilt for kernel - -* Fri Jan 17 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.4 -- Rebuilt for kernel - -* Sun Jan 12 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.3 -- Rebuilt for kernel - -* Wed Dec 25 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.12.6-1.2 -- Rebuilt for kernel +* Sat Feb 15 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.13.3-1 +- Update to 3.13.3 +- switch from bz2 to xz * Fri Dec 20 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.12.6-1 - Update to 3.12.6