rpms/staging-kmod/F-19 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 staging-kmod.spec, 1.27, 1.28
Nicolas Chauvet
kwizart at rpmfusion.org
Sun May 19 15:19:28 CEST 2013
Author: kwizart
Update of /cvs/free/rpms/staging-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29862/F-19
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
Update to 3.9.2 for F-19
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-19/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 17 Jun 2012 13:29:53 -0000 1.7
+++ .cvsignore 19 May 2013 13:19:28 -0000 1.8
@@ -1 +1 @@
-linux-staging-3.4.2.tar.bz2
+linux-staging-3.9.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-19/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 17 Jun 2012 13:29:53 -0000 1.7
+++ sources 19 May 2013 13:19:28 -0000 1.8
@@ -1 +1 @@
-e8134cbb4b279b63a3f9af2173aa09fe linux-staging-3.4.2.tar.bz2
+2338e1c13bcdd038d2a6332f300280a4 linux-staging-3.9.2.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-19/staging-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- staging-kmod.spec 14 May 2013 12:47:04 -0000 1.27
+++ staging-kmod.spec 19 May 2013 13:19:28 -0000 1.28
@@ -1,7 +1,9 @@
# akmods not supported
# which drivers to built
-%global stgdrvs ASUS_OLED BCM_WIMAX EASYCAP ECHO EPL ET131X FB_UDL FB_XGI FT1000_USB HECI IDE_PHISON INTEL_MEI LINE6_USB RTS_PSTOR RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U RTS5139 SLICOSS SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE USB_WPAN_HCD W35UND PRISM2_USB VT6655 VT6656 ZCACHE ZRAM ZSMALLOC
+%global stgdrvs ASUS_OLED BCM_WIMAX CSR_WIFI DGRP ECHO ET131X FB_XGI FT1000 IDE_PHISON LINE6_USB NET_VENDOR_SILICOM PRISM2_USB R8187SE 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 ZCACHE ZRAM ZSMALLOC
+
+# fixme: DVB_AS102 DVB_CXD2099
# avoid this error:
# /usr/lib/rpm/debugedit: canonicalization unexpectedly shrank by one character
@@ -12,7 +14,6 @@
# VIDEO_TM6000
# VIDEO_DT3155
# CXT1E1
-# USBIP_CORE
# DVB_CXD2099
# RAMSTER
@@ -20,8 +21,8 @@
#global prever rc8
Name: staging-kmod
-Version: 3.4.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
+Version: 3.9.2
+Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.1
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -51,7 +52,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i 's|.*DABUSB.*||; s|.*SE401.*||; s|.*VICAM.*||; s|.CRYSTALH||; s|.*LIRC.*||; s|.*R8712U.*||;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; ' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
for kernel_version in %{?kernel_versions} ; do
@@ -61,58 +62,62 @@
%build
for kernel_version in %{?kernel_versions}; do
+ oldcount=0
+ # sanity check: nothing should be build
+ 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
+ exit 1
+ fi
+
+ # preparations
for module in %{stgdrvs} ; do
+ echo
+ echo "### ${module}"
+
+ # sanity check
+ if ! find . -name 'Makefile' | xargs grep "CONFIG_${module}"; then
+ echo "CONFIG_${module} does not exist; aborting" >&2
+ exit 1
+ fi
+
+ # set options
configops="CONFIG_${module}=m"
case "${module}" in
- CX25821)
- configops="${configops} CONFIG_CX25821_ALSA=m"
+ CXT1E1)
+ configops="${configops} CONFIG_SBE_PMCC4_NCOMM=y"
;;
- FT1000_USB)
+ FT1000)
configops="${configops} CONFIG_FT1000_USB=m CONFIG_FT1000_PCMCIA=m"
;;
- PRISM2_USB)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
- ;;
- RAMZSWAP)
- configops="${configops} CONFIG_RAMZSWAP_STATS=y"
- ;;
- RT3090)
- configops="${configops} -I ${PWD}/_kmod_build_${kernel_version%%___*}/"
- ;;
- RTL8192SU)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
- ;;
- R8712U)
- configops="${configops} CONFIG_R8712_AP=y"
+ NET_VENDOR_SILICOM)
+ configops="${configops} CONFIG_SBYPASS=m CONFIG_BPCTL=m"
;;
RTL8192E)
- configops="${configops} CONFIG_RTLLIB=m RTLLIB_CRYPTO_CCMP=m RTLLIB_CRYPTO_TKIP=m RTLLIB_CRYPTO_WEP=m "
+ configops="${configops} CONFIG_RTLLIB=m CONFIG_RTLLIB_CRYPTO_CCMP=m CONFIG_RTLLIB_CRYPTO_TKIP=m CONFIG_RTLLIB_CRYPTO_WEP=m "
;;
- SLICOSS)
- # does not build on ppc and ppc64 as of 011109; tested with 2.6.30.9 and 2.6.31.5
- ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
+ USBIP_CORE)
+ configops="${configops} CONFIG_USBIP_HOST=m CONFIG_USBIP_VHCI_HCD=m"
;;
SPEAKUP)
configops="${configops} CONFIG_SPEAKUP_SYNTH_ACNTSA=m CONFIG_SPEAKUP_SYNTH_ACNTPC=m CONFIG_SPEAKUP_SYNTH_APOLLO=m CONFIG_SPEAKUP_SYNTH_AUDPTR=m CONFIG_SPEAKUP_SYNTH_BNS=m CONFIG_SPEAKUP_SYNTH_DECTLK=m CONFIG_SPEAKUP_SYNTH_DECEXT=m CONFIG_SPEAKUP_SYNTH_DECPC=m CONFIG_SPEAKUP_SYNTH_DTLK=m CONFIG_SPEAKUP_SYNTH_KEYPC=m CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m CONFIG_SPEAKUP_SYNTH_DUMMY=m "
;;
- VIDEO_GO7007)
- configops="${configops} CONFIG_${module}_USB=m"
- ;;
- VIDEO_CX25821)
- configops="${configops} CONFIG_${module}_ALSA=m"
+ WIMAX_GDM72XX)
+ # broken, as of 3.8.1: CONFIG_WIMAX_GDM72XX_QOS=y CONFIG_WIMAX_GDM72XX_SDIO=y
+ configops="${configops} CONFIG_WIMAX_GDM72XX_WIMAX2=y CONFIG_WIMAX_GDM72XX_K_MODE=y CONFIG_WIMAX_GDM72XX_USB=y CONFIG_WIMAX_GDM72XX_USB_PM=y"
;;
esac
- make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules ${configops}
+ make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/ modules CONFIG_STAGING_MEDIA=y ${configops}
- case "${module}" in
- BRCMUTIL)
- # move modules down one level to catch them during install
- mv ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/*/*.ko ${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/brcm80211/
- ;;
- esac
+ # sanity check
+ newcount=$(find ${PWD}/_kmod_build_${kernel_version%%___*}/ -name '*.ko' | wc -l)
+ if (( ${oldcount} == ${newcount} )); then
+ echo "Seems no modules were build; aborting" >&2
+ exit 1
+ fi
+ oldcount=${newcount}
done
done
@@ -134,8 +139,43 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue May 14 2013 Nicolas Chauvet <kwizart at gmail.com> - 3.4.2-1.2
-- Rebuilt for kernel
+* Sat May 18 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.9.2-1
+- Update to 3.9.2
+- disable SB105X - does not compile
+- disable ZCACHE - latest version not buildable as module
+
+* Sat Apr 13 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-3
+- disable RTL8192E, now shipped upstream
+
+* Sat Mar 02 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-2
+- disable SBE_2T3E3 and CXT1E1, need something that is disabled in Fedora
+
+* Fri Mar 01 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.8.1-1
+- Update to 3.8.1
+- lot of misc small cleanups -- includes enabling a few more drivers and
+ remove code and options not relevant anymore
+- add sanity check: make sure we do not built modules that are build by Fedora
+- add sanity check: make sure each config builds at least one ko file
+
+* Mon Jan 14 2013 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.7.2-1
+- Update to 3.7.2
+
+* Thu Oct 11 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.6.1-1
+- Update to 3.6.1
+- drop declare_zsmalloc_license_and_init_exit_functions.patch
+
+* Sat Aug 25 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-3.1
+- Fix stupid thinko to make crypto stuff for rtl8192e work
+
+* Tue Jul 31 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-2.1
+- Fix zram
+
+* Tue Jul 31 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.5-1.1
+- Update to 3.5
+- Disable Mei, now a proper driver
+
+* Mon Jul 16 2012 Jonathan Dieter <jdieter at gmail.com> - 3.4.2-2.1
+- Enable USBIP
* Sun Jun 17 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.4.2-1.1
- Update to 3.4.2
@@ -306,7 +346,7 @@
- update to 2.6.34.2, which is hitting updates-testing for F13
- enable phison (#1338)
-* Fri Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
+* Sat Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-1
- update to 2.6.33.2
- enable RAMZSWAP R8187SE RTL8192U BATMAN_ADV SAMSUNG_LAPTOP
- disable RTL8187SE (renamed)
@@ -316,7 +356,7 @@
- update to 2.6.32.8 for updates-testing kernel
- disable hv on ppc as it's useless and does not build
-* Sun Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
+* Wed Dec 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32-0.1.rc1
- enable HYPERV, RT3090, RTL8192E, VT6656
- drop AGNX, dropped upstream
- point to drivers/staging/ explicitely
More information about the rpmfusion-commits
mailing list