X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=224faf0b0b7e9ed1f896afbdc94cc684a2c664c4;hb=605a139a193e4ef212560673b4bb93eec763d088;hp=e05dcb917b8980a9347397e1282b6bd1a7b6022a;hpb=bac71754b9dbb83b3ccf10ae99c027cc6b2f9829;p=fs%2Flustre-release.git diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index e05dcb9..224faf0 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -165,7 +165,7 @@ Usage: ${0##*/} [OPTION]... [-- ] 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 \ @@ -951,10 +952,8 @@ build_lustre() { return 0 } -# Only zfs Lustre DKMS Server is supported build_lustre_dkms() { local build_args="" - local name_prefix="lustre" local ver=$(sed -n -e 's/^LUSTRE_VERSION = //p' LUSTRE-VERSION-FILE) echo "Building Lustre DKMS RPMs for: $TARGET_ARCH" @@ -962,14 +961,36 @@ build_lustre_dkms() { if $PATCHLESS; then build_args="--without servers" - name_prefix="lustre-client" fi rpmbuild --define "_topdir $TOPDIR" $build_args -bs lustre-dkms.spec || fatal 1 "Error building DKMS .src.rpm for $TARGET_ARCH." - rpmbuild --define "_topdir $TOPDIR" $build_args \ - --rebuild $TOPDIR/SRPMS/$name_prefix-dkms-$ver-*.src.rpm || + + if $PATCHLESS; then + rpmbuild --define "_topdir $TOPDIR" $build_args \ + --rebuild $TOPDIR/SRPMS/lustre-client-dkms-$ver-*.src.rpm || fatal 1 "Error building DKMS .rpm for $TARGET_ARCH." + else + rpmbuild --define="_topdir $TOPDIR" --with servers \ + --with zfs --without ldiskfs -bs lustre-dkms.spec || + fatal 1 "Error creating DKMS (zfs) .srpm for $TARGET_ARCH." + rpmbuild --define="_topdir $TOPDIR" --with servers \ + --without zfs --with ldiskfs -bs lustre-dkms.spec || + fatal 1 "Error creating DKMS (ldiskfs) .srpm for $TARGET_ARCH." + rpmbuild --define="_topdir $TOPDIR" --with servers \ + --with zfs --with ldiskfs -bs lustre-dkms.spec || + fatal 1 "Error creating DKMS (all) .srpm for $TARGET_ARCH." + + rpmbuild --rebuild --define="_topdir $TOPDIR" --with servers \ + --with zfs --without ldiskfs $TOPDIR/SRPMS/lustre-zfs-dkms-$ver-*.src.rpm || + fatal 1 "Error building DKMS (zfs) .rpm for $TARGET_ARCH." + rpmbuild --rebuild --define="_topdir $TOPDIR" --with servers \ + --without zfs --with ldiskfs $TOPDIR/SRPMS/lustre-ldiskfs-dkms-$ver-*.src.rpm || + fatal 1 "Error building DKMS (ldiskfs) .rpm for $TARGET_ARCH." + rpmbuild --rebuild --define="_topdir $TOPDIR" --with servers \ + --with zfs --with ldiskfs $TOPDIR/SRPMS/lustre-all-dkms-$ver-*.src.rpm || + fatal 1 "Error building DKMS (all) .rpm for $TARGET_ARCH." + fi return 0 } @@ -994,7 +1015,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.3} + SPLZFSVER=${SPLZFSVER:-0.7.9} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . @@ -1215,18 +1236,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~ @@ -1235,14 +1248,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"} @@ -1314,15 +1319,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" ;;