From: Andrew Perepechko <andrew.perepechko@sun.com>
Date: Fri, 8 Jan 2010 16:25:43 +0000 (-0500)
Subject: b=21670 revert new version of find_linux_devel_paths
X-Git-Tag: 1.10.0.35~22
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=dcd1a836ce8c15b50e1ff8d8264d74af9efec915;ds=sidebyside

b=21670 revert new version of find_linux_devel_paths

i=Andrew Perepechko
o=Brian Murrell
---

diff --git a/build/lbuild-sles b/build/lbuild-sles
index 6a76cb0..83fae95 100644
--- a/build/lbuild-sles
+++ b/build/lbuild-sles
@@ -86,24 +86,22 @@ rpm_BUILD_kernel_dirname() {
 find_linux_devel_paths() {
     local path="$1"
 
-    LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}
+    LINUX=$path/usr/src/linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}
 
     local objects=$TARGET_ARCH/$RPMSMPTYPE
-    if [ -d $path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/powerpc ]; then
+    if [ -d $path/usr/src/linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}-obj/powerpc ]; then
         objects="powerpc/$TARGET_ARCH"
     elif [ $TARGET_ARCH == 'i686' ]; then
         objects="i386/$RPMSMPTYPE"
     fi
 
-    LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}-${lnxrel}-obj/$objects
-    LINUXRELEASE=$(find_linux_release "$LINUXOBJ")
+    LINUXOBJ=$path/usr/src/linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}-obj/$objects
 
+    LINUXRELEASE=$(find_linux_release ${LINUXOBJ:-$LINUX})
     if [ -z "$LINUXRELEASE" ]; then
-        echo "Failed to find linux release in $LINUXOBJ"
-        return 255
+        echo "Failed to find linux release in ${LINUXOBJ:-$LINUX}"
+        RC=255
     fi
-
-    return 0
 }
 
 mcpu_rpmbuild_opt() {