Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv29944
Modified Files:
.cvsignore create-linux-staging-tarball.sh sources
staging-kmod-addons.spec
Log Message:
* Sun Jun 17 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.4.2-1
- Update to 3.4.2
- Enable USB_WPAN_HCD
- disable XVMALLOC and enable replacement ZSMALLOC
- update create-linux-staging-tarball.sh to include drivers/video/sis/,
needed for FB_XGI
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 4 Apr 2012 16:17:46 -0000 1.6
+++ .cvsignore 17 Jun 2012 13:28:15 -0000 1.7
@@ -1 +1 @@
-linux-staging-3.3.tar.bz2
+linux-staging-3.4.2.tar.bz2
Index: create-linux-staging-tarball.sh
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/create-linux-staging-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- create-linux-staging-tarball.sh 1 Nov 2009 14:42:50 -0000 1.1
+++ create-linux-staging-tarball.sh 17 Jun 2012 13:28:15 -0000 1.2
@@ -13,12 +13,13 @@
# * remove tmpdir on abortion
pushd ${tmpdir}/ > /dev/null
echo downloading
-wget --quiet
http://www.kernel.org/pub/linux/kernel/v2.6/linux-${1}.tar.bz2
+wget --quiet
http://www.kernel.org/pub/linux/kernel/v3.0/linux-${1}.tar.bz2
echo extracing
-tar -xjf linux-${1}.tar.bz2 linux-${1}/COPYING linux-${1}/drivers/staging/
+tar -xjf linux-${1}.tar.bz2 linux-${1}/COPYING linux-${1}/drivers/staging/
linux-${1}/drivers/video/sis/
echo creating archive
mv linux-${1} linux-staging-${1}
-tar -cjf ${targetdir}/linux-staging-${1}.tar.bz2 linux-staging-${1}/COPYING
linux-staging-${1}/drivers/staging/
+# drivers/video/sis/vgatypes.h needed for FB_XGI
+tar -cjf ${targetdir}/linux-staging-${1}.tar.bz2 linux-staging-${1}/COPYING
linux-staging-${1}/drivers/staging/ linux-staging-${1}/drivers/video/sis/
rm -rf linux-${1}.tar.bz2 linux-staging-${1}/
popd > /dev/null
rmdir ${tmpdir}
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 4 Apr 2012 16:17:46 -0000 1.6
+++ sources 17 Jun 2012 13:28:15 -0000 1.7
@@ -1 +1 @@
-7080bd32b25b30a6c57694d846e6cecc linux-staging-3.3.tar.bz2
+e8134cbb4b279b63a3f9af2173aa09fe linux-staging-3.4.2.tar.bz2
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/devel/staging-kmod-addons.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- staging-kmod-addons.spec 14 May 2012 11:46:14 -0000 1.8
+++ staging-kmod-addons.spec 17 Jun 2012 13:28:15 -0000 1.9
@@ -1,13 +1,13 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%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 R8712U RTL8192SU RTL8192E
RTL8192U RTS5139 SLICOSS SOLO6X10 TOUCHSCREEN_CLEARPAD_TM1217
TOUCHSCREEN_SYNAPTICS_I2C_RMI4 USB_ENESTORAGE W35UND PRISM2_USB VT6655 VT6656 XVMALLOC
ZRAM ZCACHE
+%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
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 3.3
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
+Version: 3.4.2
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
Group: System Environment/Kernel
@@ -59,6 +59,13 @@
%changelog
+* Sun Jun 17 2012 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.4.2-1
+- Update to 3.4.2
+- Enable USB_WPAN_HCD
+- disable XVMALLOC and enable replacement ZSMALLOC
+- update create-linux-staging-tarball.sh to include drivers/video/sis/,
+ needed for FB_XGI
+
* Mon May 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-1.1
- Rebuilt for release