LU-11790 ldiskfs: add terminating u32 when expanding inodes

[fs/lustre-release.git] / contrib / lbuild / lbuild

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index db2c250..7bd9688 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -165,7 +165,7 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     Path to an existing lustre source tarball to use.
 
   --nodownload
-    Do not try to download a kernel from downloads.hpdd.intel.com
+    Do not try to download a kernel from downloads.whamcloud.com
 
   --nosrc
     Do not build a .src.rpm, a full kernel patch, or a patched kernel
@@ -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
@@ -1015,7 +1022,7 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-0.7.9}
+    SPLZFSVER=${SPLZFSVER:-0.7.12}
     SPLZFSTAG=${SPLZFSTAG:-}
 
     # The files expect a kver to be set to the kernel version .