From: Brian J. Murrell <brian@sun.com>
Date: Fri, 8 Jan 2010 16:38:18 +0000 (-0500)
Subject: b=21754 RPM version update fix
X-Git-Tag: v1_8_1_60~4
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=aabba85a94fdb354390c8a52413050c46f9c79b8;p=fs%2Flustre-release.git

b=21754 RPM version update fix

It seems that Suse will release an updated RPM without updating the
kernel inside.  In doing so, the kernel and the RPM file name have
different specifications of the version.
This fix allows for that.

i=yangsheng
i=wangyb
---

diff --git a/lustre/kernel_patches/targets/2.6-sles11.target.in b/lustre/kernel_patches/targets/2.6-sles11.target.in
index d167d4f..85100fa 100644
--- a/lustre/kernel_patches/targets/2.6-sles11.target.in
+++ b/lustre/kernel_patches/targets/2.6-sles11.target.in
@@ -4,6 +4,10 @@ lnxmin=".39"
 #lnxrel="0.37_f594963d"
 # and note that this means we get rid of the EXTRA_VERSION_DELIMITER crap!!
 lnxrel="39-0.3"
+# 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=".1"
 
 # this is the delimeter that goes between $lnxmaj and $lnxrel
 # defaults to "-"
@@ -13,7 +17,7 @@ EXTRA_VERSION_DELIMITER="."
 # defaults to empty
 TARGET_DELIMITER="-"
 
-KERNEL_SRPM=kernel-source-$lnxmaj.$lnxrel.1.src.rpm
+KERNEL_SRPM=kernel-source-$lnxmaj.$lnxrel${rpmfix}.src.rpm
 SERIES=2.6-sles11.series
 VERSION=$lnxmaj
 EXTRA_VERSION="${lnxrel}_lustre.@VERSION@"