X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=6a1ab0a7b961db2ba874d2026f2296307ff92814;hp=e05dcb917b8980a9347397e1282b6bd1a7b6022a;hb=6522c47dfe1d9df22507a8ad11ceed86279a5959;hpb=bac71754b9dbb83b3ccf10ae99c027cc6b2f9829 diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index e05dcb9..6a1ab0a 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -29,7 +29,7 @@ push_exit_trap "kill -INT -$$ || true" kill_children # increment this if you have made a change that should force a new kernel # to build built -BUILD_GEN=8 +BUILD_GEN=9 TOPDIR="$PWD" @@ -71,6 +71,7 @@ DISTRO= KERNELTREE= # default to not adding -lustre- into the kernel RPM package names KERNEL_LUSTRE_NAMING=false +ENABLE_KERNEL_DEBUG=false # default not use kabi check. USE_KABI=false @@ -157,6 +158,9 @@ Usage: ${0##*/} [OPTION]... [-- ] Directory containing dirs with Linux source tarballs referenced by target files. Dir names in format kernel version ('2.6.9', etc.) + --enable-kernel-debug + Build with kernel-.config-debug instead + --linux=LINUX --with-linux=LINUX Directory of Linux kernel sources. When this option is used, only Lustre modules and userspace are built. @@ -165,7 +169,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 @@ -313,41 +317,15 @@ check_options() { 3.12-sles12 | 4.4-sles12) CANONICAL_TARGET="sles12" ;; + 4.18-rhel8*) + CANONICAL_TARGET="rhel8" + ;; 3.10-rhel7*) CANONICAL_TARGET="rhel7" ;; - 2.6-rhel6*) - CANONICAL_TARGET="rhel6" - ;; - 2.6-rhel5) - CANONICAL_TARGET="rhel5" - ;; - 2.6-rhel4) - CANONICAL_TARGET="rhel-2.6" - ;; - 2.6-suse) - CANONICAL_TARGET="sles-2.6" - ;; - 2.6-sles10) - CANONICAL_TARGET="sles10-2.6" - ;; - 2.6-sles11 | 3.0-sles11) + 3.0-sles11) CANONICAL_TARGET="sles11" ;; - 2.6-oel5) - CANONICAL_TARGET="oel5" - ;; - hp_pnnl-2.4) - CANONICAL_TARGET="hp-pnnl-2.4" - ;; - 2.6-vanilla \ - | suse-2.4.21-2 \ - | rh-2.4 \ - | rhel-2.4 \ - | sles-2.4 \ - | 2.6-patchless) - CANONICAL_TARGET="$TARGET" - ;; esac local timestampnodig=$(echo $TIMESTAMP | sed -e s/[0-9]*//g) @@ -478,11 +456,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 +613,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) @@ -708,9 +691,15 @@ load_target() { XENPOSTFIX="-xen" fi - if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then - CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config" - fi + if $ENABLE_KERNEL_DEBUG; then + if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config-debug ]; then + CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config-debug" + fi + else + if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then + CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config" + fi + fi local lnxrelnew=${lnxrel//-/_} @@ -799,8 +788,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 @@ -951,10 +943,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 +952,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,22 +1006,24 @@ 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.13} SPLZFSTAG=${SPLZFSTAG:-} + # "spl zfs" prior to 0.8.0 + # "zfs" for 0.8.0 and later + SPLZFSPKGS="spl zfs" # The files expect a kver to be set to the kernel version . local kver=$(find_linux_release) # build and install the spl and zfs (and -devel) RPMs for lustre to use local pkg - for pkg in spl zfs; do - - local rpmpkg + local spldir + for pkg in $SPLZFSPKGS; do - [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)" + local rpmpkg - # need to fetch the repo in order to build it. - # default to github but allow override + # need to fetch the repo in order to build it. + # default to github but allow override git clone -n ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1 pushd $pkg || return 255 @@ -1021,91 +1035,98 @@ build_spl_zfs() { fi git checkout -b lbuild $tag || fatal 1 "Failed to checkout \"$tag\" for $pkg.git" - # This differentiates between older zfs versions - if [ -f $pkg-modules.spec.in ]; then - rpmpkg=$pkg-modules - specdir=. - speclist="$pkg.spec $rpmpkg.spec" - else - rpmpkg=kmod-$pkg-devel - specdir=rpm/generic - speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec" - fi - - sh autogen.sh || return 255 - - if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \ - ${spldir:+--with-spl="${spldir}"} 2>&1 || - ! make dist 2>&1; then - popd - return 255 - fi - popd - - ln -f $pkg/$pkg-*.tar.gz $TOPDIR/SOURCES || - error "failed to link $pkg/$pkg-*.tar.gz into $TOPDIR/SOURCES" - if [ -f $pkg/scripts/kmodtool ]; then - ln -f $pkg/scripts/kmodtool $TOPDIR/SOURCES/ - fi + # This differentiates between older zfs versions + if [ -f $pkg-modules.spec.in ]; then + rpmpkg=$pkg-modules + specdir=. + speclist="$pkg.spec $rpmpkg.spec" + else + rpmpkg=kmod-$pkg-devel + specdir=rpm/generic + speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec" + fi - local rpmb - if $DO_SRC; then - rpmb=-ba - else - rpmb=-bb - fi + sh autogen.sh || return 255 - # set search dir for our own kmodtool to find correct - # directories - export KERNELSOURCE=$(dirname ${LINUX}) - # Manually build rpms - for spec in $speclist; do - echo "Building RPMs from $pkg/$specdir/$spec" - if ! rpmbuild $rpmb $pkg/$specdir/$spec \ - --nodeps -v \ - --define "_use_internal_dependency_generator 0" \ - --define "require_kdir ${LINUX}" \ - ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \ - ${spldir:+--define "require_spldir ${spldir}"} \ - --define "kver $kver" \ - --define "kernels $kver" \ - --define "_tmppath /var/tmp" \ - --define "kernelbuildroot $TOPDIR/reused" \ - --define "_topdir $TOPDIR" 2>&1; then - return 255 - fi - done + if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \ + ${spldir:+--with-spl="${spldir}"} 2>&1 || + ! make dist 2>&1; then + popd + return 255 + fi + popd - # We have built the rpms for the package. Now we need to extract the - # contained files so we can build further things against them - local rpms=$(ls -1 $TOPDIR/RPMS/*/$rpmpkg-*.rpm) + ln -f $pkg/$pkg-*.tar.gz $TOPDIR/SOURCES || + error "failed to link $pkg/$pkg-*.tar.gz into $TOPDIR/SOURCES" + if [ -f $pkg/scripts/kmodtool ]; then + ln -f $pkg/scripts/kmodtool $TOPDIR/SOURCES/ + fi - # cpio only extract to pwd so we need to go there. - pushd $TOPDIR - local rpm - for rpm in $rpms; do - rpm2cpio $rpm | cpio -id - done + local rpmb + if $DO_SRC; then + rpmb=-ba + else + rpmb=-bb + fi - if [ "$pkg" == "zfs" ]; then - # We also need to extract both the zfs and zfs-devel rpms - # the zfs rpm is needed because it has the actual libraries in - # it and the zfs-devel rpm only has unversioned symlinks to the - # libraries in the zfs rpm - # this will all change one day when we have a libzfs rpm per - # https://github.com/zfsonlinux/zfs/issues/2329 - # and it looks like it could be one day soon: - # https://github.com/zfsonlinux/zfs/pull/2341 - local devel_rpms=$(ls -1 $TOPDIR/RPMS/*/{$pkg-devel,$pkg-$SPLZFSVER,lib*}-*.rpm) - for rpm in $devel_rpms; do - rpm2cpio $rpm | cpio -id - done - CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR ${CONFIGURE_FLAGS}" - fi - popd + # set search dir for our own kmodtool to find correct + # directories + export KERNELSOURCE=$(dirname ${LINUX}) + # Manually build rpms + for spec in $speclist; do + echo "Building RPMs from $pkg/$specdir/$spec" + if ! rpmbuild $rpmb $pkg/$specdir/$spec \ + --nodeps -v \ + --define "_use_internal_dependency_generator 0" \ + --define "require_kdir ${LINUX}" \ + ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \ + ${spldir:+--define "require_spldir ${spldir}"} \ + --define "kver $kver" \ + --define "kernels $kver" \ + --define "_tmppath /var/tmp" \ + --define "kernelbuildroot $TOPDIR/reused" \ + --define "_topdir $TOPDIR" 2>&1; then + return 255 + fi + done + + # We have built the rpms for the package. Now we need to extract the + # contained files so we can build further things against them + local rpms=$(ls -1 $TOPDIR/RPMS/*/$rpmpkg-*.rpm) + + # cpio only extract to pwd so we need to go there. + pushd $TOPDIR + local rpm + for rpm in $rpms; do + rpm2cpio $rpm | cpio -id + done + + if [ "$pkg" == "zfs" ]; then + # We also need to extract both the zfs and zfs-devel rpms + # the zfs rpm is needed because it has the actual libraries in + # it and the zfs-devel rpm only has unversioned symlinks to the + # libraries in the zfs rpm + # this will all change one day when we have a libzfs rpm per + # https://github.com/zfsonlinux/zfs/issues/2329 + # and it looks like it could be one day soon: + # https://github.com/zfsonlinux/zfs/pull/2341 + local devel_rpms=$(ls -1 $TOPDIR/RPMS/*/{$pkg-devel,$pkg-$SPLZFSVER,lib*}-*.rpm) + for rpm in $devel_rpms; do + rpm2cpio $rpm | cpio -id + done + CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR ${CONFIGURE_FLAGS}" + if [ -z "$spldir" ]; then + # if spldir is empty, then we are only building ZFS and need to define SPL config flags + CONFIGURE_FLAGS="--with-spl=$(ls -d $TOPDIR/usr/src/spl-*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-spl-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" + fi + elif [ "$pkg" == "spl" ]; then + spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)" + fi + popd - CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*|tail -1) ${CONFIGURE_FLAGS}" - CONFIGURE_FLAGS="--with-$pkg-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-$pkg-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" done OSDZFSRPM=true @@ -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" ;; @@ -1924,7 +1929,7 @@ set -E [ -r ~/.lbuildrc ] && . ~/.lbuildrc options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,\ -patchless,patchless-server,ccache,norpm,external-patches:,timestamp:,\ +patchless,patchless-server,enable-kernel-debug,ccache,norpm,external-patches:,timestamp:,\ extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-type:,\ ofed-version:,mlnx-version:,ofed-src:,publish,disable-zfs,release,set-value:,\ src,stage:,target:,with-linux:,xen -- "$@") @@ -2000,6 +2005,10 @@ while [ "$1" ]; do PATCHLESS_SERVER=true shift ;; + --enable-kernel-debug) + ENABLE_KERNEL_DEBUG=true + shift + ;; --kernelrpm) if ! KERNELRPMSBASE=$(canon_path "$2"); then fatal 1 "Could not determine the canonical location of $2"