From 3dea7b17f268d77dcaf9b063182015f8150418e8 Mon Sep 17 00:00:00 2001 From: Minh Diep Date: Wed, 31 Oct 2018 11:49:38 -0700 Subject: [PATCH] LU-11553 build: add download 7.5alternate for MOFED Mellanox download file name for aarch64 need to use rhel7.5alternate as distro Rename target file to be more precise which minor version we are using Change-Id: I02a31afa2a7803b3e78d975829a36a97eb64f021 Signed-off-by: Minh Diep Reviewed-on: https://review.whamcloud.com/33527 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Nathaniel Clark Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 13 ++++++++++--- lustre/autoconf/lustre-core.m4 | 2 +- .../series/{4.14-rhel7.series => 4.14-rhel7.5.series} | 0 .../{4.14-rhel7.target.in => 4.14-rhel7.5.target.in} | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) rename lustre/kernel_patches/series/{4.14-rhel7.series => 4.14-rhel7.5.series} (100%) rename lustre/kernel_patches/targets/{4.14-rhel7.target.in => 4.14-rhel7.5.target.in} (95%) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 224faf0..370783a 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -635,7 +635,11 @@ 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} - file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}.tgz" + if [[ $arch = "aarch64" ]]; then + file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}alternate-${arch}.tgz" + else + file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}.tgz" + fi download_file "$location/$file" "$KERNELTREE" "$force" ;; ifs) @@ -800,8 +804,11 @@ 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} - file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}" - + if [[ $arch = "aarch64" ]]; then + file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}alternate-${arch}" + else + file="MLNX_OFED_LINUX-${ofed_version}-${distro_name}-${arch}" + fi # it's not important what distro we get the tarball since we only # interest in the src if ! untar "$KERNELTREE/${file}.tgz"; then diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 625913e..798a931a7 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -3514,7 +3514,7 @@ lustre/include/Makefile lustre/include/lustre/Makefile lustre/include/uapi/linux/lustre/Makefile lustre/kernel_patches/targets/3.10-rhel7.target -lustre/kernel_patches/targets/4.14-rhel7.target +lustre/kernel_patches/targets/4.14-rhel7.5.target lustre/kernel_patches/targets/2.6-rhel6.9.target lustre/kernel_patches/targets/2.6-rhel6.8.target lustre/kernel_patches/targets/2.6-rhel6.7.target diff --git a/lustre/kernel_patches/series/4.14-rhel7.series b/lustre/kernel_patches/series/4.14-rhel7.5.series similarity index 100% rename from lustre/kernel_patches/series/4.14-rhel7.series rename to lustre/kernel_patches/series/4.14-rhel7.5.series diff --git a/lustre/kernel_patches/targets/4.14-rhel7.target.in b/lustre/kernel_patches/targets/4.14-rhel7.5.target.in similarity index 95% rename from lustre/kernel_patches/targets/4.14-rhel7.target.in rename to lustre/kernel_patches/targets/4.14-rhel7.5.target.in index 47e142c..26a111e7 100644 --- a/lustre/kernel_patches/targets/4.14-rhel7.target.in +++ b/lustre/kernel_patches/targets/4.14-rhel7.5.target.in @@ -2,7 +2,7 @@ lnxmaj="4.14.0" lnxrel="49.13.1.el7a" KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm -SERIES=4.14-rhel7.series +SERIES=4.14-rhel7.5.series EXTRA_VERSION=${lnxrel}_lustre.@VERSION@ LUSTRE_VERSION=@VERSION@ -- 1.8.3.1