Author: thl Update of /cvs/free/rpms/staging-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20687 Modified Files: .cvsignore sources staging-kmod.spec Log Message: * Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1 - Update to 3.15.4 - drop ECHI and R8187SE (left) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-20/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 30 Apr 2014 11:35:51 -0000 1.11 +++ .cvsignore 13 Jul 2014 13:54:09 -0000 1.12 @@ -1 +1 @@ -linux-staging-3.14.2.tar.xz +linux-staging-3.15.4.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-20/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 Apr 2014 11:35:51 -0000 1.11 +++ sources 13 Jul 2014 13:54:09 -0000 1.12 @@ -1 +1 @@ -c8c1e4c64c1e5fbe482e3c2e956d43a8 linux-staging-3.14.2.tar.xz +998298567f41b99c223016dda0940855 linux-staging-3.15.4.tar.xz Index: staging-kmod.spec =================================================================== RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- staging-kmod.spec 8 Jul 2014 11:33:26 -0000 1.60 +++ staging-kmod.spec 13 Jul 2014 13:54:09 -0000 1.61 @@ -1,7 +1,8 @@ # akmods not supported # which drivers to built -%global stgdrvs BCM_WIMAX DGRP ECHO 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 +%global stgdrvs BCM_WIMAX DGRP FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB 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 + %ifnarch %{arm} %global stgdrvs %{stgdrvs} SLICOSS ET131X %endif @@ -24,8 +25,8 @@ #global prever rc8 Name: staging-kmod -Version: 3.14.2 -Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.10 +Version: 3.15.4 +Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist} Summary: Selected kernel modules from linux-staging Group: System Environment/Kernel @@ -55,7 +56,7 @@ %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; /.IMX/ d; /.DWC2/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile') +sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8723AU/ 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} @@ -74,7 +75,7 @@ make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ newcount=$(find ${PWD}/_kmod_build_${kernel_version%%___*}/ -name '*.ko' | wc -l) if (( ${oldcount} != ${newcount} )); then - echo "Modules build when not should get build; aborting" >&2 + echo "Modules build when none should get build; aborting" >&2 exit 1 fi @@ -149,32 +150,9 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.10 -- Rebuilt for kernel - -* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.9 -- Rebuilt for kernel - -* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.8 -- Rebuilt for kernel - -* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.7 -- Rebuilt for kernel - -* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.6 -- Rebuilt for kernel - -* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.5 -- Rebuilt for kernel - -* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.4 -- Rebuilt for kernel - -* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.3 -- Rebuilt for kernel - -* Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.14.2-1.2 -- Rebuilt for kernel +* Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1 +- Update to 3.15.4 +- drop ECHI and R8187SE (left) * Wed Apr 30 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.14.2-1 - Update to 3.14.2