From: Minh Diep <minh.diep@intel.com>
Date: Mon, 11 Sep 2017 17:02:19 +0000 (-0700)
Subject: LU-9996 build: include MOFED lib
X-Git-Tag: 2.10.54~4
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=f3ffc1ed656dd2aeafe7aaba69f77df75231e160

LU-9996 build: include MOFED lib

Test-Parameters: trivial

Change-Id: Ia1b5a97f59d5055311786934c9165a81f2af7cae
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/29020
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 02f0a30..82cb06f 100755
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -816,6 +816,7 @@ unpack_ofed() {
 				return 1
 			fi
 			[ -d OFED ] || ln -sf MLNX_OFED_SRC-[0-9].[0-9]* OFED
+			[ -d OFED_RPMS ] || ln -sf ${file}/RPMS OFED_RPMS
 			;;
 		ifs)
 			file="IntelIB-Basic.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.${ofed_version}"
@@ -1319,6 +1320,11 @@ EOF
 			${SOURCE} 2>&1; then
 			fatal 1 "Error building ${kib_rpm}"
 		fi
+		# now that we have the kernel rpms, we need to lib rpms too
+		# we don't have to rebuild since MOFED include the binaries
+		cp -f OFED_RPMS/{libibmad-*,libibverbs-*,libibumad-*,librdmacm*,ibutils-*,opensm-libs*}.${TARGET_ARCH}.rpm \
+			${TOPDIR}/RPMS/${TARGET_ARCH} || \
+			fatal 1 "Failed to copy MOFED rpms"
 		;;
 	esac