rpms/kernel/F-9 kernel.spec,1.777,1.778

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec 
Log Message:
Support building -stable RC kernels.
  Kernel versioning example: 2.6.26.6-52.rc1.fc9


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.777
retrieving revision 1.778
diff -u -r1.777 -r1.778
--- kernel.spec	1 Oct 2008 17:19:27 -0000	1.777
+++ kernel.spec	3 Oct 2008 17:31:07 -0000	1.778
@@ -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 5
+# 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}
 
@@ -111,8 +119,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
@@ -123,6 +138,7 @@
 %endif
 %endif
 %define pkg_release 0.%{fedora_build}%{?rctag}%{?gittag}%{?buildid}%{?dist}
+
 %endif
 
 # The kernel tarball/base version
@@ -530,7 +546,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
@@ -553,9 +576,6 @@
 ### BRANCH PATCH ###
 %endif
 
-# stable release candidate
-#Patch03: patch-2.6.26.4-rc1
-
 # we always need nonintconfig, even for -vanilla kernels
 Patch06: linux-2.6-build-nonintconfig.patch
 
@@ -985,9 +1005,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}
@@ -1018,9 +1041,6 @@
   done
 %endif
 
-# stable release candidate
-#ApplyPatch patch-2.6.26.4-rc1
-
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
 # builds (as used in the buildsystem).
@@ -1905,6 +1925,10 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Oct 03 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-51
+- Support building -stable RC kernels.
+  Kernel versioning example: 2.6.26.6-52.rc1.fc9
+
 * Wed Oct 01 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.26.5-50
 - Add config option to disallow adding CPUs after booting.