From: Brian Murell <brian.murrell@oracle.com>
Date: Mon, 11 Oct 2010 12:02:16 +0000 (+0200)
Subject: b=20744 remedial fix for inkernel ofed handling
X-Git-Tag: v1_8_5_RC1~16
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=59a27bdfd0770dc673d0db8cc3d5432dd144bc65;p=fs%2Flustre-release.git

b=20744 remedial fix for inkernel ofed handling

i=yangsheng

It seems that the patch to add inkernel handling for SLES10's OFED introduced a
bug for other inkernel uses.  This fixes that bug.
---

diff --git a/build/lbuild b/build/lbuild
index 2babed6..b742afb 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -1491,19 +1491,25 @@ build_ofed() {
 
     # if an ofed version is given, then it means use OFED proper,
     # not any vendor specific "inkernel" version
-    if [ -z "$ofed_version" -o "$ofed_version" = "inkernel" ]; then
-        # first see if there is a distro specific override for this
-        # XXX we need to better integrate an distro specific override with
+    if [ -z "$ofed_version" ]; then
+        return 0
+    fi
+
+    if [ "$ofed_version" = "inkernel" ]; then
+        # see if there is a distro specific override for this and use
+        # that if it exists
+        # XXX we need to better integrate a distro specific override with
         #     the rest of this function so that all of the reuse cache
         #     stuff is leveraged given that 80% of this function is reuse
         if type -p build_ofed-${DISTRO}; then
             local ofed_location
             ofed_location=$(build_ofed-${DISTRO} ${STDOUT})
+            local rc=${PIPESTATUS[0]}
             CONFIGURE_FLAGS="--with-o2ib=${ofed_location} ${CONFIGURE_FLAGS}"
-            return ${PIPESTATUS[0]}
+            return $rc
+        else
+            return 0
         fi
-    else
-        return 0
     fi
     
     # build kernel-ib