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 <mdiep@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/33527
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 224faf0..370783a 100755 (executable)
--- 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..798a931 100644 (file)
--- 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..26a111e 100644 (file)
--- 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@