b=15482

i=cliffw
i=wangyb

Allow a kernel target to specify a delimiter between the final "flavor"
specification and the version.
Specifically this allows RH kernels to be <version>smp and SLES10 kernels
to be <version>-smp.
Maintaining the vendors versioning specification means that when software
is trying to determine a vendors kernel using patterns (like OFED does), it
properly detects the SLES10 kernel.
This all lays the ground work for bug 15316.

diff --git a/lustre/kernel_patches/targets/2.6-sles10.target.in b/lustre/kernel_patches/targets/2.6-sles10.target.in
index 6ac2e0f..35ddd85 100644 (file)
--- a/lustre/kernel_patches/targets/2.6-sles10.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles10.target.in
@@ -1,8 +1,14 @@
 lnxmaj="2.6.16"
 lnxrel="54-0.2.5"
 
 lnxmaj="2.6.16"
 lnxrel="54-0.2.5"
 

+# this is the delimeter that goes between $lnxmaj and $lnxrel
+# defaults to "-"

 EXTRA_VERSION_DELIMITER="."
 
 EXTRA_VERSION_DELIMITER="."
 

+# this is the delimeter that goes before the "smp" at the end of the version
+# defaults to empty
+TARGET_DELIMITER="-"
+

 KERNEL=linux-$lnxmaj.$lnxrel.tar.bz2
 SERIES=2.6-sles10.series
 VERSION=$lnxmaj
 KERNEL=linux-$lnxmaj.$lnxrel.tar.bz2
 SERIES=2.6-sles10.series
 VERSION=$lnxmaj