X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fkernel_patches%2Ftargets%2F2.6-sles10.target.in;h=2eb48dddbd92d9c3f73a7cd8ae7be6aefec9851c;hp=9719c33a3d35e5a23faf5eaab6e9443adc7672bc;hb=0269467999294774bae2289438021ffa01f3fc6f;hpb=58bea63cfa6df41a1871614634e9851901dfa5b0

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 9719c33..2eb48dd 100644
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -1,35 +1,34 @@
 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="60-0.42.8"
-
-# this is the delimeter that goes between $lnxmaj and $lnxrel
-# defaults to "-"
-EXTRA_VERSION_DELIMITER="."
+lnxrel="0.69.1"
+# 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
-TARGET_DELIMITER="-"
+FLAVOR_DELIMITER="-"
 
-KERNEL_SRPM=kernel-source-$lnxmaj.$lnxrel.src.rpm
+KERNEL_SRPM=kernel-source-${lnxmaj}${lnxmin}-${lnxrel}${rpmfix}.src.rpm
 SERIES=""
 VERSION=$lnxmaj
-EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"
+EXTRA_VERSION="${lnxmin#.}-${lnxrel}_lustre.@VERSION@"
 LUSTRE_VERSION=@VERSION@
 
-OFED_VERSION=1.4.2
-RDAC_VERSION="09.03.0C02.0013"
-MPTLINUX_VERSION="4.16.00.00-2"
+OFED_VERSION=inkernel
+# if using "inkernel" on sles10, we need to know which version of ofed-devel
+# to use
+OFED_DEVEL_VERSION="1.4.2-0.8.4.1682.0.PTF.578796"
 
 BASE_ARCHS="i686 ppc x86_64 ia64 ppc64"
 BIGMEM_ARCHS=""
 BOOT_ARCHS=""
 JENSEN_ARCHS=""
-SMP_ARCHS="x86_64 ia64 ppc64"
+SMP_ARCHS="x86_64 ia64"
 BIGSMP_ARCHS="i686"
 PSERIES64_ARCHS="ppc"
+PPC64_ARCHS="ppc64"
 UP_ARCHS=""
 SRC_ARCHS=""
 #RPMSMPTYPE="smp"