EX-3468 build: only include mlnx-tools for MOFED 5.4+

mlnx-tools is required starting 5.4+

Test-Parameters: trivial

Change-Id: I8fdd4d0b4ac86335d4d7fe349c89f502d608940c
Signed-off-by: Minh Diep <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44370
Reviewed-by: Gaurang Tapase <gtapase@ddn.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index abbb51c..efa69c5 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1428,7 +1428,13 @@ EOF
                        ${TOPDIR}/RPMS/${TARGET_ARCH} || \
                        fatal 1 "Failed to copy MOFED rpms"
                fi
-               cp -f OFED_RPMS/{libib*,librdmacm*,ibutils*,opensm-*,infiniband-diags*,ucx*,mlnx-tools*}.${TARGET_ARCH}.rpm \
+               # Starting from MOFED 5.4, mlnx-tools is required
+               if compare_version 5.4 $ofed_version; then
+                       cp -f OFED_RPMS/mlnx-tools*.${TARGET_ARCH}.rpm \
+                       ${TOPDIR}/RPMS/${TARGET_ARCH} || \
+                       fatal 1 "Failed to copy MOFED rpms"
+               fi
+               cp -f OFED_RPMS/{libib*,librdmacm*,ibutils*,opensm-*,infiniband-diags*,ucx*}.${TARGET_ARCH}.rpm \
                        ${TOPDIR}/RPMS/${TARGET_ARCH} || \
                        fatal 1 "Failed to copy MOFED rpms"
                ;;