From: brian <brian>
Date: Tue, 2 Jun 2009 10:45:02 +0000 (+0000)
Subject: b=19671
X-Git-Tag: v1_9_0_200~31
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=d4bbe0ab0ae9296054b56fe2ec66d9d9eba53c7d;p=fs%2Flustre-release.git

b=19671
i=jack
i=wangyb

Give lbuild's old-school-build RPM storage code the ability to understand
the format of RPMs built from OFED pre-releases.
---

diff --git a/build/lbuild.old_school b/build/lbuild.old_school
index d36861b..869be39 100644
--- a/build/lbuild.old_school
+++ b/build/lbuild.old_school
@@ -305,8 +305,10 @@ store_for_reuse() {
     if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then
         # store kernel-ib RPMs
         local rpmname
+        local ofed_version=$(echo $OFED_VERSION |
+                             sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//')
         for rpmname in "kernel-ib" "kernel-ib-devel"; do
-            rpmname="${rpmname}-${OFED_VERSION}"
+            rpmname="${rpmname}-${ofed_version}"
             if $PATCHLESS; then
                 rpmname="${rpmname}-${LINUXRELEASE//-/_}"
             else