From: Minh Diep <mdiep@whamcloud.com>
Date: Thu, 6 Jan 2022 21:02:39 +0000 (-0800)
Subject: LU-15417 build: build MOFED 5.5
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0dbbe482148d93c8d08a95bb24aa9ffc597284f9;p=fs%2Flustre-release.git

LU-15417 build: build MOFED 5.5

The path the mofed header files has change to
/usr/src/ofa_kernel/x86_64/<kernel>
so we cannot assume it's /usr/src/ofa_kernel/default

Test-Parameters: trivial
Change-Id: I10f375b459f04b84003e70951e4e423295001f40
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/46004
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index fb6c011..54ab4d8 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1847,7 +1847,6 @@ build_ofed() {
     mkdir ${kib_rpm}-devel
     cd ${kib_rpm}-devel
 
-	o2ib_location="$(pwd)/usr/src/${kib_prefix}"
 	case $ofed_type in
 		mlnx) # Prior to MOFED 3.1, we had to use build_kernel_ib=1 to
 		      # build devel rpm. not so after 3.1
@@ -1856,7 +1855,6 @@ build_ofed() {
 			else
 				rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version%%-*}-*.rpm)
 			fi
-			o2ib_location="${o2ib_location}/default"
 			;;
 		ofa) # Prior to OFA 3.18, we had to use build_kernel_ib=1 during configure,
 		     # not so after 3.18
@@ -1870,11 +1868,12 @@ build_ofed() {
 			rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-*.rpm)
 			;;
 	esac
-
 	if ! rpm2cpio < $rpm | cpio -id; then
 		fatal 1 "could not unpack the $rpm."
 	fi
-	CONFIGURE_FLAGS="--with-o2ib=${o2ib_location} ${CONFIGURE_FLAGS}"
+	# find the path (this might not work for ofa and ifs)
+	o2ib_location=$(find $(pwd)/usr/src/${kib_prefix} -type d -name ofed_scripts)
+	CONFIGURE_FLAGS="--with-o2ib=$(dirname ${o2ib_location}) ${CONFIGURE_FLAGS}"
 	popd >/dev/null
 
 }