rpms/staging-kmod/F-13 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 staging-kmod.spec, 1.13, 1.14

[Thorsten Leemhuis]

Author: thl

Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21601

Modified Files:
	.cvsignore sources staging-kmod.spec 
Log Message:
* Fri 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)
- disable WAVELAN.* and PCMCIA_NETWAVE, as they are enabled in Fedora



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Dec 2009 20:54:51 -0000	1.3
+++ .cvsignore	16 Apr 2010 19:47:06 -0000	1.4
@@ -1 +1 @@
-linux-staging-2.6.32-rc8.tar.bz2
+linux-staging-2.6.33.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Dec 2009 20:54:51 -0000	1.3
+++ sources	16 Apr 2010 19:47:06 -0000	1.4
@@ -1 +1 @@
-6715d98bbef8b2435af028e23cef7029  linux-staging-2.6.32-rc8.tar.bz2
+30b3429415fc1395911e52208b5db269  linux-staging-2.6.33.2.tar.bz2


Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/staging-kmod.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- staging-kmod.spec	2 Dec 2009 20:54:51 -0000	1.13
+++ staging-kmod.spec	16 Apr 2010 19:47:06 -0000	1.14
@@ -3,17 +3,17 @@
 # "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
 
 # which drivers to built
-%global stgdrvs ASUS_OLED EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RTL8187SE RTL8192SU RTL8192E SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
+%global stgdrvs ASUS_OLED BATMAN_ADV EPL ET131X FB_UDL HECI HYPERV LINE6_USB RT2860 RT2870 RT3070 RT3090 RAMZSWAP R8187SE RTL8192SU RTL8192E RTL8192U SAMSUNG_LAPTOP SLICOSS W35UND PRISM2_USB VIDEO_GO7007 VT6655 VT6656
 # todo: VIDEO_CX25821
 
 # makes handling for rc kernels a whole lot easier:
-%global prever rc8
+#global prever rc8
 
 Name:          staging-kmod
-Version:       2.6.32
+Version:       2.6.33.2
 Release:       %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
 Summary:       Selected kernel modules from linux-staging
 
@@ -44,7 +44,7 @@
 %setup -q -c -T -a 0
 
 # disable drivers that are enabled in Fedora's kernel, as those otherweise will get build
-sed -i 's|.*at76.*||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*||' linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
 
 # seperate directories for each kernel variant (PAE, non-PAE, ...) we build the modules for
 for kernel_version in %{?kernel_versions} ; do
@@ -57,13 +57,20 @@
  for module in %{stgdrvs} ; do 
    configops="CONFIG_${module}=m"
    case "${module}" in
-     VIDEO_HYPERV)
+     CX25821)
+       configops="${configops} CONFIG_CX25821_ALSA"
+       ;;
+     HYPERV)
+       ( [[ "%{_target_cpu}" == "ppc" ]] || [[ "%{_target_cpu}" == "ppc64" ]] ) && continue
        configops="${configops} CONFIG_${module}_STORAGE=m CONFIG_${module}_BLOCK=m CONFIG_${module}_NET=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%%___*}/"
        ;;
@@ -103,8 +110,17 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %changelog
+* Fri 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)
+- disable WAVELAN.* and PCMCIA_NETWAVE, as they are enabled in Fedora
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.32.8-1
+- 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
 - enable HYPERV, RT3090, RTL8192E, VT6656
 - drop AGNX, dropped upstream