LU-9996 build: include MOFED lib

Test-Parameters: trivial

Lustre-change: https://review.whamcloud.com/#/c/29020/
Lustre-commit: 81ebf59c99b1e58d05d6d9af1ce645b09ecf3792

Change-Id: Ia1b5a97f59d5055311786934c9165a81f2af7cae
Signed-off-by: Minh Diep <minh.diep@intel.com>
Reviewed-on: https://review.whamcloud.com/29118
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 02f0a30..82cb06f 100755 (executable)
--- 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