rpms/kernel/F-10 patch-2.6.29-rc6-git3.bz2.sign, NONE, 1.1 .cvsignore, 1.990, 1.991 config-ia64-generic, 1.19, 1.20 kernel.spec, 1.1276, 1.1277 sources, 1.951, 1.952 upstream, 1.862, 1.863 drm-edid-revision-0-should-be-valid.patch, 1.1, NONE linux-2.6-iwlwifi-dma-direction.patch, 1.1, NONE patch-2.6.29-rc6-git2.bz2.sign, 1.1, NONE

Thu Feb 26 19:10:50 UTC 2009

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16244

Modified Files:
	.cvsignore config-ia64-generic kernel.spec sources upstream 
Added Files:
	patch-2.6.29-rc6-git3.bz2.sign 
Removed Files:
	drm-edid-revision-0-should-be-valid.patch 
	linux-2.6-iwlwifi-dma-direction.patch 
	patch-2.6.29-rc6-git2.bz2.sign 
Log Message:
Linux 2.6.29-rc6-git3
More source tree sharing between checkouts.

--- NEW FILE patch-2.6.29-rc6-git3.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBJpd31yGugalF9Dw4RAknFAJ9dCP2J9MHmnUSWpZmBQJ3lNtMvGgCfdX0X
BRX53slG6NvyqS1wmf52tuo=
=d9Ie
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.990
retrieving revision 1.991
diff -u -r1.990 -r1.991
--- .cvsignore	26 Feb 2009 18:18:38 -0000	1.990
+++ .cvsignore	26 Feb 2009 19:10:19 -0000	1.991
@@ -6,4 +6,4 @@
 kernel-2.6.28
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git2.bz2
+patch-2.6.29-rc6-git3.bz2


Index: config-ia64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-ia64-generic,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- config-ia64-generic	12 Jan 2009 19:51:27 -0000	1.19
+++ config-ia64-generic	26 Feb 2009 19:10:19 -0000	1.20
@@ -210,3 +210,5 @@
 
 CONFIG_PARAVIRT_GUEST=y
 CONFIG_PARAVIRT=y
+
+CONFIG_DMAR_DEFAULT_ON=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1276
retrieving revision 1.1277
diff -u -r1.1276 -r1.1277
--- kernel.spec	26 Feb 2009 18:18:38 -0000	1.1276
+++ kernel.spec	26 Feb 2009 19:10:19 -0000	1.1277
@@ -57,7 +57,7 @@
 # The rc snapshot level
 %define rcrev 6
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -626,8 +626,6 @@
 
 Patch682: linux-2.6-rt2x00-asus-leds.patch
 
-Patch690: linux-2.6-iwlwifi-dma-direction.patch
-
 Patch1515: linux-2.6.29-lirc.patch
 Patch1520: linux-2.6-hdpvr.patch
 
@@ -639,7 +637,6 @@
 Patch1812: drm-modesetting-radeon.patch
 Patch1814: drm-nouveau.patch
 Patch1816: drm-no-gem-on-i8xx.patch
-Patch1818: drm-edid-revision-0-should-be-valid.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -930,25 +927,35 @@
   fi
 
 %if "%{kversion}" != "%{vanillaversion}"
-  cp -rl vanilla-%{kversion} vanilla-%{vanillaversion}
-%endif
-  cd vanilla-%{vanillaversion}
+
+  if [[ ! -z $sharedir  &&  -d $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} ]] ; then
+
+      cp -rl $sharedir/kernel-%{kversion}/vanilla-%{vanillaversion} .
+
+  else
+
+    cp -rl vanilla-%{kversion} vanilla-%{vanillaversion}
+    cd vanilla-%{vanillaversion}
 
 # Update vanilla to the latest upstream.
 # (non-released_kernel case only)
 %if 0%{?rcrev}
-ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
+    ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
 %if 0%{?gitrev}
-ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
+    ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2
 %endif
 %else
 # pre-{base_sublevel+1}-rc1 case
 %if 0%{?gitrev}
-ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
+    ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
 %endif
 %endif
 
-  cd ..
+    cd ..
+
+  fi
+
+%endif
 
 else
   # We already have a vanilla dir.
@@ -1141,9 +1148,6 @@
 # rt2x00: back-port activity LED init patches
 ApplyPatch linux-2.6-rt2x00-asus-leds.patch
 
-# Intel wireless DMA fix
-ApplyPatch linux-2.6-iwlwifi-dma-direction.patch
-
 # http://www.lirc.org/
 ApplyPatch linux-2.6.29-lirc.patch
 # http://hg.jannau.net/hdpvr/
@@ -1161,7 +1165,6 @@
 ApplyPatch drm-modesetting-radeon.patch
 ApplyPatch drm-nouveau.patch
 ApplyPatch drm-no-gem-on-i8xx.patch
-ApplyPatch drm-edid-revision-0-should-be-valid.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1756,6 +1759,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Thu Feb 26 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.47.rc6.git3
+- Linux 2.6.29-rc6-git3
+- More source tree sharing between checkouts.
+
 * Wed Feb 25 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-0.46.rc6.git2
 - Allow sharing kernel source trees between CVS checkouts.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.951
retrieving revision 1.952
diff -u -r1.951 -r1.952
--- sources	25 Feb 2009 15:33:31 -0000	1.951
+++ sources	26 Feb 2009 19:10:20 -0000	1.952
@@ -1,3 +1,3 @@
 d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
 26f67d99666834cc579094619821d3c8  patch-2.6.29-rc6.bz2
-d693f91cabf1acbd4dd6b737bf72351e  patch-2.6.29-rc6-git2.bz2
+3aa05e1f1aa398e287c8595c709e1c22  patch-2.6.29-rc6-git3.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- upstream	25 Feb 2009 15:33:31 -0000	1.862
+++ upstream	26 Feb 2009 19:10:20 -0000	1.863
@@ -1,3 +1,3 @@
 linux-2.6.28.tar.bz2
 patch-2.6.29-rc6.bz2
-patch-2.6.29-rc6-git2.bz2
+patch-2.6.29-rc6-git3.bz2


--- drm-edid-revision-0-should-be-valid.patch DELETED ---


--- linux-2.6-iwlwifi-dma-direction.patch DELETED ---


--- patch-2.6.29-rc6-git2.bz2.sign DELETED ---


