b=19336 fix landing error

[fs/lustre-release.git] / lustre / kernel_patches / targets / 2.6-sles10.target.in

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 4794f8c..c78170e 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -1,20 +1,17 @@
 lnxmaj="2.6.16"
 lnxmin=".60"
-# when we fix up this lnxmaj/lnxmin/lnxrel business...
-#lnxrel="0.33"
-# and note that this means we get rid of the EXTRA_VERSION_DELIMITER crap!!
 lnxrel="0.42.8"
-
-# this is the delimeter that goes between $lnxmaj and $lnxrel
-# defaults to "-"
-EXTRA_VERSION_DELIMITER="."
+# use this when there is an "RPM fix" which means that the name of the
+# (source) RPM has been updated but the version of the kernel inside the
+# RPM is not also updated
+rpmfix=""
 
 # this is the delimeter that goes before the "smp" at the end of the version
 # defaults to empty
 FLAVOR_DELIMITER="-"
 
-KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}.src.rpm
-SERIES=2.6-sles10.series
+KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm
+SERIES=""
 VERSION=$lnxmaj
 EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@