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 db3795f..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
@@ -478,11 +478,12 @@ download_srpm() {
 
        # let the download_file handle the concurrency
        if $DOWNLOAD; then
-               local location= \
-               "https://downloads.hpdd.intel.com/public/kernels/$target/old"
+               local location
                # get the location from a distro specific method if it exists
                if type -p kernel_srpm_location; then
                        location=$(kernel_srpm_location)
+               else
+                       fatal 1 "Must specify location for download kernel SRPM."
                fi
                echo "Downloading $location/$srpm..."
                if ! download_file \
@@ -634,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)
@@ -799,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
@@ -1014,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 .
@@ -1235,18 +1243,10 @@ build_kernel_ib() {
     local K_SRC="K_SRC"
 
        local OFED_CORE="--with-core-mod --with-ipoib-mod --with-user_mad-mod \
-       --with-user_access-mod --with-addr_trans-mod --with-madeye-mod"
-       local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod \
-       --with-mlx4_en-mod --with-cxgb3-mod --with-mlx4_en-mod \
-       --with-cxgb3-mod --with-nes-mod --with-mlx5-mod --with-cxgb4-mod \
-       --with-qib-mod"
-
-       # Removing the check for older version support
-       #if compare_version $OFED_VERSION 3.0; then
-       #OFED_CORE="$OFED_CORE --with-madeye-mod --with-rds-mod"
-       #else
-       #OFED_HARDWARE="$OFED_HARDWARE --with-mlx5-mod --with-cxgb4-mod --with-ocrdma-mod --with-qib-mod"
-       #fi
+       --with-user_access-mod --with-addr_trans-mod --with-innova-flex "
+       local OFED_HARDWARE="--with-mlx4-mod --with-mlx4_en-mod \
+       --with-srp-mod --with-iser-mod --with-isert-mod --with-mlx5-mod \
+       --with-mlxfw-mod "
 
     # some I/B drivers are architecture dependent and kernel-ib's configure
     # does not figure it out for us ~sigh~
@@ -1255,14 +1255,6 @@ build_kernel_ib() {
             OFED_HARDWARE="$OFED_HARDWARE --with-ehca-mod"
             ;;
     esac
-    # we're no longer shipping the OFED iSCSI target
-    #OFED_ISCSI="--with-srp-mod --with-srp-target-mod"
-    OFED_ISCSI="--with-srp-mod"
-    ## ISER module has no backport support as of OFED 1.5 (i.e. only builds on
-    ##kernels >= 2.6.30)
-    #if [[ $OFED_VERSION = 1.[0-4]* ]]; then
-    #   OFED_ISCSI="$OFED_ISCSI --with-iser-mod"
-    #fi
 
     # assume we are just rebuilding the SRPM
     local BUILD_TYPE=${BUILD_TYPE:-"--rebuild"}
@@ -1334,15 +1326,15 @@ EOF
                        ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
                        --define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \
                        --define "KVERSION ${linuxrelease}" \
+                       --define "KMP 1" \
                        --define "$K_SRC ${linux}" \
                        ${OFA_KERNEL_RELEASE:+--define "_release $OFA_KERNEL_RELEASE"} \
-                       --define "configure_options --without-quilt $OFED_CORE $OFED_HARDWARE $OFED_ISCSI" \
                        ${SOURCE} 2>&1; then
                        fatal 1 "Error building ${kib_rpm}"
                fi
                # now that we have the kernel rpms, we need to lib rpms too
                # we don't have to rebuild since MOFED include the binaries
-               cp -f OFED_RPMS/{libibmad-*,libibverbs-*,libibumad-*,librdmacm*,ibutils-*,opensm-libs*}.${TARGET_ARCH}.rpm \
+               cp -f OFED_RPMS/{libibmad-*,libibverbs-*,libibumad-*,librdmacm*,ibutils-*,opensm-*}.${TARGET_ARCH}.rpm \
                        ${TOPDIR}/RPMS/${TARGET_ARCH} || \
                        fatal 1 "Failed to copy MOFED rpms"
                ;;