6:17 a.m.
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7469
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
reimport the version that matches 2.6.34
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 20 Aug 2010 15:08:06 -0000 1.6
+++ .cvsignore 29 Aug 2010 06:17:45 -0000 1.7
@@ -1 +1 @@
-linux-staging-2.6.33.2.tar.bz2
+linux-staging-2.6.34.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 20 Aug 2010 15:08:06 -0000 1.6
+++ sources 29 Aug 2010 06:17:45 -0000 1.7
@@ -1 +1 @@
-30b3429415fc1395911e52208b5db269 linux-staging-2.6.33.2.tar.bz2
+acb2cc2eb8280ce9dba4d2070a0a00d1 linux-staging-2.6.34.2.tar.bz2
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/staging-kmod.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- staging-kmod.spec 28 Aug 2010 18:50:37 -0000 1.31
+++ staging-kmod.spec 29 Aug 2010 06:17:45 -0000 1.32
@@ -6,15 +6,16 @@
%define buildforkernels newest
# which drivers to built
-%global stgdrvs ASUS_OLED BATMAN_ADV ECHO 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
+%global stgdrvs ASUS_OLED BATMAN_ADV ECHO EPL ET131X FB_UDL HECI HYPERV IDE_PHISON
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
Name: staging-kmod
-Version: 2.6.33.2
-Release: %{?prever:0.}2%{?prever:.%{prever}}%{?dist}.11
+Version: 2.6.34.2
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.2
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -43,8 +44,8 @@
# prepare
%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.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*||'
linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/Makefile
+# disable drivers that are enabled in Fedora's kernel, as those otherweise would get
build
+sed -i 's|.*at76.*||; s|.*WAVELAN.*||; s|.*PCMCIA_NETWAVE.*|| ; s|.CRYSTALH||'
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
@@ -111,41 +112,12 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sat Aug 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.11
-- rebuild for new kernel
-
-* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.10
-- rebuild for new kernel
-
-* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.8
-- rebuild for new kernel
-
-* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.7
-- rebuild for new kernel
-
-* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.6
-- rebuild for new kernel
-
-* Fri May 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.5
+* Wed Aug 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.34.2-1.2
- rebuild for new kernel
-* Thu May 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.4
-- rebuild for new kernel
-
-* Fri May 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.3
-- rebuild for new kernel
-
-* Tue May 04 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.2
-- rebuild for new kernel
-
-* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.1
-- rebuild for new kernel
-
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.6.33.2-2
-- enable echo
-
-* Sun Apr 25 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-1.1
-- rebuild for new kernel
+* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.34.2-1.1
+- 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
- update to 2.6.33.2