From 279c26466bff37dd25fe26e4bb56a16a9a797870 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Mon, 30 Sep 2019 11:25:50 -0700 Subject: [PATCH] LU-12825 build: change lbuild to support MOFED 4.7 * Remove 'alternate' name in MOFED tar * use MLNX_LIBS to download rpms Test-Parameters: trivial Change-Id: Ia5a4f51455be836a7df4fa6b3e9eccc17cffef2c Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/36333 Tested-by: jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 2d070098..4d72c93 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -613,7 +613,7 @@ download_ofed() { # this is a work around for suse distro (sles11.3). what we need is # sles11sp3. We really need to redesign how we use target and distro [[ $distro_name =~ sles ]] && distro_name=${DISTRO/./sp} - if [[ $arch = "aarch64" ]]; then + if [[ $arch = "aarch64" ]] && [[ $DISTROMAJ < "rhel8" ]]; then file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}alternate-${arch}.tgz" else file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}.tgz" @@ -788,7 +788,7 @@ unpack_ofed() { # this is a work around for suse distro (sles11.3). what we need is # sles11sp3. We really need to redesign how we use target and distro [[ $distro_name =~ sles ]] && distro_name=${DISTRO/./sp} - if [[ $arch = "aarch64" ]]; then + if [[ $arch = "aarch64" ]] && [[ $DISTROMAJ < "rhel8" ]]; then file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}alternate-${arch}" else file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}" @@ -808,7 +808,11 @@ 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 + if compare_version $ofed_version 4.7; then + [ -d OFED_RPMS ] || ln -sf ${file}/RPMS OFED_RPMS + else + [ -d OFED_RPMS ] || ln -sf ${file}/RPMS/MLNX_LIBS OFED_RPMS + fi ;; ifs) file="IntelIB-Basic.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.${ofed_version}" -- 1.8.3.1