rpms/kernel/devel kernel.spec,1.1010,1.1011

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24879

Modified Files:
	kernel.spec 
Log Message:
Support building -stable RC kernels.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1010
retrieving revision 1.1011
diff -u -r1.1010 -r1.1011
--- kernel.spec	4 Oct 2008 05:22:58 -0000	1.1010
+++ kernel.spec	4 Oct 2008 05:28:16 -0000	1.1011
@@ -30,11 +30,19 @@
 
 ## If this is a released kernel ##
 %if 0%{?released_kernel}
-# Do we have a 2.6.21.y update to apply?
+
+# Do we have a -stable update to apply?
 %define stable_update 0
+# Is it a -stable RC?
+%define stable_rc 0
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev .%{stable_update}
+%define stable_base %{stable_update}
+%if 0%{?stable_rc}
+# stable RCs are incremental patches, so we need the previous stable patch
+%define stable_base %(expr %{stable_base} - 1)
+%endif
 %endif
 %define rpmversion 2.6.%{base_sublevel}%{?stablerev}
 
@@ -115,8 +123,15 @@
 
 # pkg_release is what we'll fill in for the rpm Release: field
 %if 0%{?released_kernel}
-%define pkg_release %{fedora_build}%{?buildid}%{?dist}
+
+%if 0%{?stable_rc}
+%define stable_rctag .rc%{stable_rc}
+%endif
+%define pkg_release %{fedora_build}%{?stable_rctag}%{?buildid}%{?dist}
+
 %else
+
+# non-released_kernel
 %if 0%{?rcrev}
 %define rctag .rc%rcrev
 %endif
@@ -127,6 +142,7 @@
 %endif
 %endif
 %define pkg_release 0.%{fedora_build}%{?rctag}%{?gittag}%{?buildid}%{?dist}
+
 %endif
 
 # The kernel tarball/base version
@@ -513,7 +529,14 @@
 
 # For a stable release kernel
 %if 0%{?stable_update}
-Patch00: patch-2.6.%{base_sublevel}.%{stable_update}.bz2
+%if 0%{?stable_base}
+%define    stable_patch_00  patch-2.6.%{base_sublevel}.%{stable_base}.bz2
+Patch00: %{stable_patch_00}
+%endif
+%if 0%{?stable_rc}
+%define    stable_patch_01  patch-2.6.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.bz2
+Patch01: %{stable_patch_01}
+%endif
 
 # non-released_kernel case
 # These are automagically defined by the rcrev and gitrev values set up
@@ -938,9 +961,12 @@
 
 cd linux-%{kversion}.%{_target_cpu}
 
-# released_kernel with stable_update available case
-%if 0%{?stable_update}
-ApplyPatch patch-2.6.%{base_sublevel}.%{stable_update}.bz2
+# released_kernel with possible stable updates
+%if 0%{?stable_base}
+ApplyPatch %{stable_patch_00}
+%endif
+%if 0%{?stable_rc}
+ApplyPatch %{stable_patch_01}
 %endif
 
 %if %{using_upstream_branch}
@@ -1749,6 +1775,9 @@
 
 %changelog
 * Sat Oct 04 2008 Chuck Ebbert <cebbert at redhat.com>
+- Support building -stable RC kernels.
+
+* Sat Oct 04 2008 Chuck Ebbert <cebbert at redhat.com>
 - 2.6.27-rc8-git6
 
 * Fri Oct 03 2008 Dave Jones <davej at redhat.com>