rpms/kernel/devel kernel-2.6.spec,1.3291,1.3292
Jarod Wilson (jwilson)
fedora-extras-commits at redhat.com
Tue Jul 10 21:27:52 UTC 2007
Author: jwilson
Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22747
Modified Files:
kernel-2.6.spec
Log Message:
A few minor conditional tweaks and additional infrastructure for automagic application of stable release incrementals when applicable
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3291
retrieving revision 1.3292
diff -u -r1.3291 -r1.3292
--- kernel-2.6.spec 10 Jul 2007 20:21:51 -0000 1.3291
+++ kernel-2.6.spec 10 Jul 2007 21:27:17 -0000 1.3292
@@ -28,11 +28,11 @@
%define base_sublevel 22
## If this is a released kernel ##
-%if %{released_kernel}
+%if 0%{?released_kernel}
# Do we have a 2.6.21.y update to apply?
%define stable_update 0
# Set rpm version accordingly
-%if 0%{stable_update}
+%if 0%{?stable_update}
%define stablerev .%{stable_update}
%endif
%define rpmversion 2.6.%{base_sublevel}%{?stablerev}
@@ -42,9 +42,9 @@
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(expr %{base_sublevel} + 1)
# The rc snapshot level
-#%define rcrev 0
+%define rcrev 0
# The git snapshot level
-#%define gitrev 0
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -111,7 +111,7 @@
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
# pkg_release is what we'll fill in for the rpm Release: field
-%if %{released_kernel}
+%if 0%{?released_kernel}
%define pkg_release %{fedora_build}%{?buildid}%{?dist}
%else
%if 0%{?rcrev}
@@ -474,6 +474,21 @@
# Here should be only the patches up to the upstream canonical Linus tree.
# These are automagically defined by the rcrev and gitrev values set up
# near the top of this spec file.
+
+# For a stable release kernel
+%if 0%{?stable_update}
+Patch00: patch-2.6.%{base_sublevel}.1.bz2
+# at present, you'll have to manually uncomment needed incrementals
+# here to get up to 2.6.%{base_sublevel}.%{stable_update}, but they will
+# all be automatically applied
+#Patch01: patch-2.6.%{base_sublevel}.1-2.bz2
+#Patch02: patch-2.6.%{base_sublevel}.2-3.bz2
+#Patch03: patch-2.6.%{base_sublevel}.3-4.bz2
+#Patch04: patch-2.6.%{base_sublevel}.4-5.bz2
+#Patch05: patch-2.6.%{base_sublevel}.5-6.bz2
+
+# non-released_kernel case
+%else
%if 0%{?rcrev}
Patch00: patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
%if 0%{?gitrev}
@@ -485,6 +500,7 @@
Patch00: patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
%endif
%endif
+%endif
%endif
@@ -963,6 +979,18 @@
%else
# Update to latest upstream.
+# released_kernel with stable_update available case
+%if 0%{?stable_update}
+ApplyPatch patch-2.6.%{base_sublevel}.1.bz2
+if [ %{stable_update} -ge 2 ]; then
+ for p in `seq 2 %{stable_update}`; do
+ let o=p-1
+ ApplyPatch patch-2.6.%{base_sublevel}.$o-$p.bz2
+ done
+fi
+
+# non-released_kernel case
+%else
%if 0%{?rcrev}
ApplyPatch patch-2.6.%{upstream_sublevel}-rc%{rcrev}.bz2
%if 0%{?gitrev}
@@ -974,6 +1002,7 @@
ApplyPatch patch-2.6.%{base_sublevel}-git%{gitrev}.bz2
%endif
%endif
+%endif
%endif
More information about the scm-commits
mailing list