# 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"
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
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-<version>.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.
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)
return 1
}
+# Return a numeric version code based on a version string. The version
+# code is useful for comparison two version strings to see which is newer.
+version_code() {
+ # split arguments like "0.8.0" into "0", "8", "0"
+ eval set -- $(tr "[:punct:]" " " <<< $*)
+ echo -n "$((($1 << 16) | ($2 << 8) | $3))"
+}
+
uniqify() {
echo $(echo "$*" | xargs -n 1 | sort -u)
# 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" ]] && [[ $DISTROMAJ < "rhel8" ]]; 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)
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//-/_}
# 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" ]] && [[ $DISTROMAJ < "rhel8" ]]; 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
return 1
fi
[ -d OFED ] || ln -sf MLNX_OFED_SRC-[0-9].[0-9]* OFED
- [ -d OFED_RPMS ] || ln -sf ${file}/RPMS OFED_RPMS
+ if compare_version $ofed_version 4.7; then
+ [ -d OFED_RPMS ] || ln -sf ${file}/RPMS OFED_RPMS
+ else
+ [ -d OFED_RPMS ] || ln -sf ${file}/RPMS/MLNX_LIBS OFED_RPMS
+ fi
;;
ifs)
file="IntelIB-Basic.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.${ofed_version}"
# 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.8.3}
SPLZFSTAG=${SPLZFSTAG:-}
+ # "spl zfs" prior to 0.8.0
+ # "zfs" for 0.8.0 and later
+ (( $(version_code $SPLZFSVER) < $(version_code 0.8.0) )) &&
+ SPLZFSPKGS="spl zfs" || SPLZFSPKGS="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 spldir
+ for pkg in $SPLZFSPKGS; do
- local rpmpkg
+ local rpmpkg
- [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)"
-
- # 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
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
rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
SOURCE="${TOPDIR}/SPECS/${kib_prefix}.spec"
local file ed_fragment1 ed_fragment2 n=1
- for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch); do
+ for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch 2>/dev/null); do
ed_fragment1="$ed_fragment1
Patch$n: ${file%%*/}"
ed_fragment2="$ed_fragment2
cp $file ${TOPDIR}/SOURCES
let n=$n+1
done
- for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed); do
+ for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed 2>/dev/null); do
# Only apply the ed-scripts that should be used for the canonical target
# ed-files in ${TOPDIR}/lustre/contrib/patches/ofed/ have to follow the naming
# convention
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-*}.${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"
;;
sed -e '/_VERSION=/s/_[0-9]*_g.*$//g';
cat "$FULL_PATCH";
cat "$LBUILD_DIR/lbuild";
+ test -f lbuild-${DISTROMAJ%%[0-9]*} &&
+ cat lbuild-${DISTROMAJ%%[0-9]*};
cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } |
md5sum | cut -d" " -f1)
# see if we can link to the reuse pool
echo "$BUILD_GEN")";
cat "${linux}/include/linux/autoconf.h";
cat "$LBUILD_DIR/lbuild";
+ test -f lbuild-${DISTROMAJ%%[0-9]*} &&
+ cat lbuild-${DISTROMAJ%%[0-9]*};
cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } |
md5sum | cut -d" " -f1)
# see if we can link to the reuse pool
fi
fi
- # ~sigh~ have to make copies of and modify some of the rpm
- # infrastructure files so that find-requires can find our unpacked
- # kernel-devel artifacts
- cp $RPM_HELPERS_DIR/{symset-table,find-requires{,.ksyms}} .
- export FIND_REQUIRES="$(pwd)/find-requires"
- chmod 755 {symset-table,find-requires{,.ksyms}}
- local tmp="$(pwd)"
- tmp="${tmp//\//\\/}"
- ed find-requires <<EOF
-1a
-set -x
-.
-/|.*find-requires.ksyms/s/|/| bash -x/
-g/ [^ ]*\/\(find-requires\.ksyms\)/s// $tmp\/\1/g
-wq
-EOF
- ed find-requires.ksyms <<EOF
-1a
-set -x
-.
-g/\/.*\/\(symset-table\)/s//$tmp\/\1/g
-g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g
-wq
-EOF
- ed symset-table <<EOF
-1a
-set -x
-.
-g/\(\/boot\/\)/s//$tmp\/reused\1/g
-g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g
-wq
-EOF
+ # ~sigh~ have to make copies of and modify some of the rpm
+ # infrastructure files so that find-requires can find our unpacked
+ # kernel-devel artifacts
+ cp $RPM_HELPERS_DIR/{symset-table,find-requires{,.ksyms}} .
+ export FIND_REQUIRES="$(pwd)/find-requires"
+ chmod 755 {symset-table,find-requires{,.ksyms}}
+ local tmp="$(pwd)"
+ tmp="${tmp//\//\\/}"
+ sed -i "s/\/.*find-requires.ksyms/$tmp\/find-requires.ksyms/g" find-requires
+ sed -i "s/\/usr\/src\/kernels/$tmp\/reused\/usr\/src\/kernels/" find-requires.ksyms
+ sed -i "s/\/boot/$tmp\/reused\/boot/; s/\/usr\/src\/kernels/$tmp\/reused\/usr\/src\/kernels/" symset-table
build_ofed "${LINUXOBJ:-$LINUX}" "$ofed_type" "$ofed_version" ||
fatal 1 "error building OFED"
[ -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 -- "$@")
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"
git://git.whamcloud.com / fs / lustre-release.git / blobdiff