b=21656 Quiet dirty_max CERROR

[fs/lustre-release.git] / build / lbuild.old_school

diff --git a/build/lbuild.old_school b/build/lbuild.old_school
index fcb4ddb..869be39 100644 (file)
--- 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
@@ -533,7 +535,7 @@ patchless_build_sequence() {
     TARGET_ARCH=$(rpm -q --queryformat "%{ARCH}" -p "$kernel_devel_rpm")
     BUILD_ARCHS="$TARGET_ARCH"
 
-    unpack_linux_rpm "$kernel_devel_rpm" "$delimiter" && rpmfound=true
+    unpack_linux_devel_rpm "$kernel_devel_rpm" "$delimiter" && rpmfound=true
 
     [ -d SRPMS ] || mkdir SRPMS
     [ -d RPMS ] || mkdir RPMS