rpms/kernel/F-10 linux-2.6.29.tar.bz2.sign, NONE, 1.1 .cvsignore, 1.1001, 1.1002 config-generic, 1.222, 1.223 kernel.spec, 1.1300, 1.1301 sources, 1.962, 1.963 upstream, 1.873, 1.874 linux-2.6-net-tulip-interrupt.patch, 1.1, NONE linux-2.6.28.tar.bz2.sign, 1.1, NONE patch-2.6.29-rc8-git6.bz2.sign, 1.1, NONE patch-2.6.29-rc8.bz2.sign, 1.1, NONE

Chuck Ebbert cebbert at fedoraproject.org
Tue Mar 24 02:25:28 UTC 2009


Author: cebbert

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

Modified Files:
	.cvsignore config-generic kernel.spec sources upstream 
Added Files:
	linux-2.6.29.tar.bz2.sign 
Removed Files:
	linux-2.6-net-tulip-interrupt.patch linux-2.6.28.tar.bz2.sign 
	patch-2.6.29-rc8-git6.bz2.sign patch-2.6.29-rc8.bz2.sign 
Log Message:
Linux 2.6.29
Dropped linux-2.6-net-tulip-interrupt.patch, merged upstream


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

iD8DBQBJyBu6yGugalF9Dw4RAupRAJ931BZUr25fhvz3pe8gjqUk75dMggCbBhRH
on+UYURfgCCkE5v7iKMYvao=
=tHWy
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/.cvsignore,v
retrieving revision 1.1001
retrieving revision 1.1002
diff -u -r1.1001 -r1.1002
--- .cvsignore	23 Mar 2009 03:29:46 -0000	1.1001
+++ .cvsignore	24 Mar 2009 02:24:57 -0000	1.1002
@@ -3,7 +3,5 @@
 GNUmakefile
 kernel-2.6.*.config
 temp-*
-kernel-2.6.28
-linux-2.6.28.tar.bz2
-patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git6.bz2
+kernel-2.6.29
+linux-2.6.29.tar.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/config-generic,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- config-generic	23 Mar 2009 20:22:13 -0000	1.222
+++ config-generic	24 Mar 2009 02:24:57 -0000	1.223
@@ -1339,6 +1339,7 @@
 # CONFIG_CFG80211_REG_DEBUG is not set
 CONFIG_NL80211=y
 CONFIG_LIB80211=m
+# CONFIG_LIB80211_DEBUG is not set
 CONFIG_WIRELESS=y
 CONFIG_WIRELESS_OLD_REGULATORY=y
 CONFIG_WIRELESS_EXT=y


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1300
retrieving revision 1.1301
diff -u -r1.1300 -r1.1301
--- kernel.spec	23 Mar 2009 20:22:13 -0000	1.1300
+++ kernel.spec	24 Mar 2009 02:24:58 -0000	1.1301
@@ -3,7 +3,7 @@
 # For a stable, released kernel, released_kernel should be 1. For rawhide
 # and/or a kernel built from an rc or git snapshot, released_kernel should
 # be 0.
-%define released_kernel 0
+%define released_kernel 1
 
 # Versions of various parts
 
@@ -20,7 +20,7 @@
 # kernel spec when the kernel is rebased, so fedora_build automatically
 # works out to the offset from the rebase, so it doesn't get too ginormous.
 #
-%define fedora_cvs_origin   1230
+%define fedora_cvs_origin   1300
 %define fedora_build_string %(R="$Revision$"; R="${R%% \$}"; R="${R#: 1.}"; echo $R)
 %define fedora_build_origin %(R=%{fedora_build_string}; R="${R%%%%.*}"; echo $R)
 %define fedora_build_prefix %(expr %{fedora_build_origin} - %{fedora_cvs_origin})
@@ -30,7 +30,7 @@
 # base_sublevel is the kernel version we're starting with and patching
 # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base,
 # which yields a base_sublevel of 21.
-%define base_sublevel 28
+%define base_sublevel 29
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
@@ -55,9 +55,9 @@
 # The next upstream release sublevel (base_sublevel+1)
 %define upstream_sublevel %(expr %{base_sublevel} + 1)
 # The rc snapshot level
-%define rcrev 8
+%define rcrev 0
 # The git snapshot level
-%define gitrev 6
+%define gitrev 0
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -649,9 +649,6 @@
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
 
-# Fix DEBUG_SHIRQ problem in tulip driver.  (454575)
-Patch2030: linux-2.6-net-tulip-interrupt.patch
-
 # olpc fixes
 
 # linux1394 git patches
@@ -1177,8 +1174,6 @@
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
-ApplyPatch linux-2.6-net-tulip-interrupt.patch
-
 # Nouveau DRM + drm fixes
 ApplyPatch drm-next.patch
 ApplyPatch drm-modesetting-radeon.patch
@@ -1777,6 +1772,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Mar 23 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29-1
+- Linux 2.6.29
+- Dropped linux-2.6-net-tulip-interrupt.patch, merged upstream
+
 * Mon Mar 23 2009 Kyle McMartin <kyle at redhat.com> 2.6.29-0.70.rc8.git6
 - squashfs3.patch: add in legacy squashfs support for livecds and such.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/sources,v
retrieving revision 1.962
retrieving revision 1.963
diff -u -r1.962 -r1.963
--- sources	23 Mar 2009 03:29:47 -0000	1.962
+++ sources	24 Mar 2009 02:24:58 -0000	1.963
@@ -1,3 +1 @@
-d351e44709c9810b85e29b877f50968a  linux-2.6.28.tar.bz2
-0a86c29a637967fddeb1ba2ed8b33e59  patch-2.6.29-rc8.bz2
-d9e7915a1afe844e1dcf2e7daf7e7d91  patch-2.6.29-rc8-git6.bz2
+64921b5ff5cdadbccfcd3820f03be7d8  linux-2.6.29.tar.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/upstream,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- upstream	23 Mar 2009 03:29:47 -0000	1.873
+++ upstream	24 Mar 2009 02:24:58 -0000	1.874
@@ -1,3 +1 @@
-linux-2.6.28.tar.bz2
-patch-2.6.29-rc8.bz2
-patch-2.6.29-rc8-git6.bz2
+linux-2.6.29.tar.bz2


--- linux-2.6-net-tulip-interrupt.patch DELETED ---


--- linux-2.6.28.tar.bz2.sign DELETED ---


--- patch-2.6.29-rc8-git6.bz2.sign DELETED ---


--- patch-2.6.29-rc8.bz2.sign DELETED ---




More information about the fedora-extras-commits mailing list