From 47891c79999b17d54f2ffc4f97d3eda2968be079 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 21 Jul 2021 16:17:48 -0700 Subject: [PATCH] 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 Reviewed-on: https://review.whamcloud.com/44370 Reviewed-by: Gaurang Tapase Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- contrib/lbuild/lbuild | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index abbb51c..efa69c5 100755 --- 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" ;; -- 1.8.3.1