Author: thl
Update of /cvs/free/rpms/staging-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31811
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* 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)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-13/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 16 Apr 2010 19:47:06 -0000 1.4
+++ .cvsignore 8 Aug 2010 14:15:52 -0000 1.5
@@ -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 16 Apr 2010 19:47:06 -0000 1.4
+++ sources 8 Aug 2010 14:15:52 -0000 1.5
@@ -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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- staging-kmod.spec 8 Aug 2010 10:10:58 -0000 1.26
+++ staging-kmod.spec 8 Aug 2010 14:15:52 -0000 1.27
@@ -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}.9
+Version: 2.6.34.2
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.1
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,38 +112,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Sun Aug 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> -
2.6.33.2-2.9
-- 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
-- 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