From: brian <brian>
Date: Wed, 16 Apr 2008 14:41:07 +0000 (+0000)
Subject: b=15482
X-Git-Tag: v1_8_0_110~616
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=3fa171667efc94e38530cf19392b5449bd760175;p=fs%2Flustre-release.git

b=15482
i=cliffw
i=wangyb

Allow a kernel target to specify a delimiter between the version and the
"flavor" (i.e. "smp")
 - 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
--- 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"
 
+# this is the delimeter that goes between $lnxmaj and $lnxrel
+# defaults to "-"
 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