b=19336 Get rid of the EXTRA_VERSION_DELIMETER shenanigans

[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 90fe29c..4794f8c 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -3,7 +3,7 @@ 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="60-0.42.8"
+lnxrel="0.42.8"
 
 # this is the delimeter that goes between $lnxmaj and $lnxrel
 # defaults to "-"
@@ -11,12 +11,12 @@ EXTRA_VERSION_DELIMITER="."
 
 # this is the delimeter that goes before the "smp" at the end of the version
 # defaults to empty
-TARGET_DELIMITER="-"
+FLAVOR_DELIMITER="-"
 
-KERNEL_SRPM=kernel-source-$lnxmaj.$lnxrel.src.rpm
-SERIES=""
+KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}.src.rpm
+SERIES=2.6-sles10.series
 VERSION=$lnxmaj
-EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"
+EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
 
 OFED_VERSION=1.5.1