X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Flbuild%2Flbuild;h=0cf39bad9912e7e4133d671ef0eaf081e462a19f;hb=527b2cd8e593b52326519d13418daf34b6b53b0e;hp=1e82acd6bde9c6213ed6da827f0e8f2c5dc20376;hpb=b08ae049797807247b85e3faf6472a632d32f03f;p=fs%2Flustre-release.git diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 1e82acd..0cf39ba 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -36,9 +36,8 @@ push_exit_trap "kill -INT -$$ || true" kill_children #BUILD_GEN=5 # TT-107: don't cache the BUILD dir BUILD_GEN=6 # TT-1092: don't cache the BUILD dir, to rebuild external OFED -TOPDIR=$PWD +TOPDIR="$PWD" -# CVSROOT is inherited from the environment KERNELDIR= LINUX= LUSTRE= @@ -48,7 +47,6 @@ RELEASE=false # simply don't account for this option DO_SRC=true DOWNLOAD=true -TAG= CANONICAL_TARGET= TARGET= TARGET_ARCH="$(uname -m)" @@ -62,22 +60,19 @@ EXTRA_VERSION= STAGEDIR= TMPDIR=${TMPDIR:-"/var/tmp"} TIMESTAMP= -# this is a dir to try reuse old kernel RPMs in (although, it seems to be -# unused in any real manner -REUSERPM= +# default OFED +OFED_TYPE="inkernel" # this is the dir that should be used to store reuse products REUSEBUILD= # should cached products be used or force rebuilding? USE_BUILD_CACHE=true # what does this do exactly? does it imply no kernel build? -NORPM=false IOKITRPM=true -LDISKFSRPM=true OSDLDISKFSRPM=true OSDZFSRPM=false -SKIPLDISKFSRPM="v1_4_* b1_4" SMPTYPES="smp bigsmp default ''" PATCHLESS=false +WITH_ZFS="" XEN=false LINUXOBJ= DISTRO= @@ -110,7 +105,6 @@ LUSTRE_TESTS=true DATE=$(date) -USE_DATESTAMP=1 RPMBUILD= export CC=${CC:-gcc} @@ -131,11 +125,6 @@ usage() { cat <] - -d CVSROOT - Specifies the CVS Root to use when pulling files from CVS. The - environment variable \$CVSROOT is used if this option is not - present. - --external-patches=EXTERNAL_PATCHES Directory similar to lustre/lustre/kernel_patches/ that lbuild should look for seres and config files in before looking in the lustre @@ -147,9 +136,6 @@ Usage: ${0##*/} [OPTION]... [-- ] --timestamp=TIMESTAMP Date of building lustre in format YYYYMMDDhhmmss - --reuserpm=DIR - Try to reuse old kernel RPMs from DIR - --reusebuild=DIR Try to reuse old kernel builds from DIR @@ -160,7 +146,7 @@ Usage: ${0##*/} [OPTION]... [-- ] Use ccache --norpm - Do not build RPMs (compile only mode) + Unused. --patchless Build lustre client only @@ -181,18 +167,35 @@ Usage: ${0##*/} [OPTION]... [-- ] Lustre modules and userspace are built. --lustre=LUSTRE - Path to an existing lustre source tarball to use instead of - pulling from CVS. + Path to an existing lustre source tarball to use. --nodownload - Do not try to download a kernel from downloads.lustre.org + Do not try to download a kernel from downloads.hpdd.intel.com --nosrc Do not build a .src.rpm, a full kernel patch, or a patched kernel tarball. + --ofed-type + Type of OFED to build with lustre: inkernel, ofa, mlnx, ifs + ofa: OpenFabrics Alliance + mlnx: Mellanox + ifs: Intel True Scale Fabric + + --ofed-version + Version of external OFED to build with lustre + + --mlnx-version + Version of external Mellanox OFED to build with lustre + + --ofed-src + Tarball for either OFED. Tarball must follow below format + OFED-.tgz regardless of vendors + It's likely that you need to reconstruct the directory name + It must be placed under KERNELTREE directory + --ldiskfs - Do ldiskfs RPM. Now true by default + Build with ldiskfs support. (Deprecated, always true) --noiokit Do not build lustre-iokit RPM. Now true by default @@ -204,6 +207,9 @@ Usage: ${0##*/} [OPTION]... [-- ] Specifies that the files generated do not include timestamps, and that this is an official release. + --disable-zfs + Build Lustre without ZFS. + --src Build a .src.rpm, a full kernel patch, and a patched kernel tarball. @@ -212,9 +218,6 @@ Usage: ${0##*/} [OPTION]... [-- ] more or less in DIR/-, and the tarball will be placed in DIR. - --tag=TAG - A CVS branch/tag name to build from when pulling from CVS. - --target=TARGET The name of the target to build. The available targets are listed below. @@ -229,11 +232,6 @@ Usage: ${0##*/} [OPTION]... [-- ] Also note that by using a non-"base" arch (eg, i386) only kernels will be built - there will be no lustre-lite-utils package. - --disable-datestamp - Prevents the datestamp flag (-D) from being passed to cvs for - checkouts. This is a workaround for a problem encountered when - using lbuild with tinderbox. - --xen Builds a Xen domX kernel. @@ -280,17 +278,35 @@ canon_path() { check_options() { - if [ "$LUSTRE" ]; then - [ -r "$LUSTRE" ] || \ - usage 1 "Could not find Lustre source tarball '$LUSTRE'." - else - [ "$CVSROOT" ] || \ - usage 1 "Either specify a CVS Root with -d, or a Lustre source tarball with --lustre." - [ "$TAG" ] || \ - usage 1 "A branch/tag name must be specified with --tag when not building from a tarball." + if [ -z "$LUSTRE" -o ! -r "$LUSTRE" ]; then + usage 1 "Could not find Lustre source tarball '$LUSTRE'." + fi + + if [ -n "${OFED_SRC}" ]; then + if [ -z "${OFED_VERSION}" ]; then + usage 1 "Need to provide version for file ${OFED_SRC}." + fi + if [ "${OFED_TYPE}" = "inkernel" ]; then + usage 1 "Need to provide ofed type for file ${OFED_SRC}." + fi + else + if [ "${OFED_TYPE}" != "inkernel" -a -z "${OFED_VERSION}" ]; then + usage 1 "Need to provide version for $OFED_TYPE OFED" + fi + + if [ "${OFED_TYPE}" = "inkernel" -a -n "${OFED_VERSION}" ]; then + usage 1 "Can not specify version with inkernel OFED" + fi + fi + + if [ -z "$DISTRO" ] ; then + DISTRO=$(autodetect_distro) + # remove separator + DISTRO=${DISTRO/-/} fi + DISTROMAJ=${DISTRO%%.*} - [ -z "$DISTRO" ] && DISTRO=$(autodetect_distro) + [ -z "$TARGET" ] && TARGET=$(autodetect_target "$DISTRO") if [ -z "$LINUX" ]; then [ "$KERNELDIR" -o "$KERNELTREE" ] || \ @@ -299,19 +315,19 @@ check_options() { [ -d "$KERNELDIR" -o -d "$KERNELTREE" ] || \ usage 1 "$KERNELDIR and $KERNELTREE are not a directory." - if ! $RELEASE; then - [ "$TAG" ] || \ - usage 1 "When building a snapshot, a tag name must be used." - fi - - [ "$TARGET" ] || TARGET=$(autodetect_target "$DISTRO") # TARGET_FILE="$TOPDIR/lustre/kernel_patches/targets/$TARGET.target" # [ -r "$TARGET_FILE" ] || \ # usage 1 "Target '$TARGET' was not found." fi case $TARGET in - 2.6-rhel6) + 3.12-sles12 | 4.4-sles12) + CANONICAL_TARGET="sles12" + ;; + 3.10-rhel7) + CANONICAL_TARGET="rhel7" + ;; + 2.6-rhel6*) CANONICAL_TARGET="rhel6" ;; 2.6-rhel5) @@ -354,31 +370,47 @@ check_options() { TIMESTAMP=$(date -d "$DATE" "+%Y%m%d%H%M%S") fi - RPMBUILD=$(which rpmbuild 2>/dev/null | head -1) - if [ ! "$RPMBUILD" -o "$RPMBUILD" == "" ]; then - RPMBUILD=$(which rpm 2>/dev/null | head -1) - if [ ! "$RPMBUILD" -o "$RPMBUILD" == "" ]; then - usage 1 "Could not find binary for making rpms (tried rpmbuild and rpm)." - fi + RPMBUILD=$(which rpmbuild 2>/dev/null | head -n 1) + RPMBUILD=${RPMBUILD:-$(which rpm 2>/dev/null | head -n 1)} + if [ -z "$RPMBUILD" ]; then + usage 1 "Could not find binary for making rpms (tried rpmbuild and rpm)." + fi + + local BINDIR="$TOPDIR/bin" + if [ -d $BINDIR ]; then + rm -rf $BINDIR >/dev/null 2>&1 || true fi + mkdir -p $BINDIR || fatal 1 "error trying to create $BINDIR" + export PATH=$BINDIR:$PATH + + cat >${BINDIR}/rpmbuild </dev/null && export DISTCC RPM_BUILD_NCPUS if which "$CCACHE" &>/dev/null; then - local ccache=$(which "$CCACHE") - local bindir="$TOPDIR/bin" + local ccache=$(which "$CCACHE" 2>/dev/null | head -n 1) - if [ ! -d $bindir ]; then - mkdir -p $bindir || fatal 1 "error trying to create $bindir" - else - rm ${bindir}/* > /dev/null 2>&1 || true - fi - ln -s "$ccache" ${bindir}/ccache - ln -s "$ccache" ${bindir}/cc - ln -s "$ccache" ${bindir}/$CC - export PATH=$bindir:$PATH - export CCACHE && export CC="ccache $CC" + ln -s "$ccache" ${BINDIR}/ccache + ln -s "$ccache" ${BINDIR}/cc + ln -s "$ccache" ${BINDIR}/$CC + + export CCACHE + export CC="ccache $CC" # zero the cache so we can see how effective we are being with it echo -n "ccache " ccache -z @@ -391,7 +423,6 @@ check_options() { fi return 0 - } # compare two versions $1 and $2. if $1 < $2, return 0 otherwise return 1. @@ -413,6 +444,7 @@ compare_version () { return 1 fi done + return 1 } uniqify() { @@ -425,13 +457,21 @@ fetch_url() { local url="$1" local target="$2" + if [ -z "$target" ]; then + fatal 1 "fetch_url() called without a target to fetch to" + fi + + if [ -d $target ]; then + target+="/${url##*/}" + fi + local rc=0 if which wget >/dev/null 2>&1; then if ! wget -nv "$url" -O "$target"; then rc=${PIPESTATUS[0]} fi elif which curl >/dev/null 2>&1; then - if ! curl -L -s -o "$target" "$url"; then + if ! curl -n -L -s -o "$target" "$url"; then rc=${PIPESTATUS[0]} fi else @@ -443,36 +483,27 @@ fetch_url() { } download_srpm() { - local target=$1 - local srpm=$2 - local force="${3:-false}" - - if $force || [ ! -r "$KERNELDIR/$srpm" ] || - [ ! -s "$KERNELDIR/$srpm" ]; then - if $DOWNLOAD; then - local location="http://downloads.lustre.org/public/kernels/$target/old" - # get the location from a distro specific method if it exists - if type -p kernel_srpm_location; then - location=$(kernel_srpm_location) - fi - echo "Downloading $location/$srpm..." - if ! fetch_url "$location/$srpm" "$KERNELDIR/$srpm" 2>&1 || - [ ! -s "$KERNELDIR/$srpm" ]; then - rm -f $KERNELDIR/$srpm - # punt to a distro specific method if it exists - if ! type -p download_srpm-$DISTRO; then - fatal 1 "Could not download target $target's kernel SRPM $srpm from $location." - else - if ! download_srpm-$DISTRO "$target" "$srpm" "$force"; then - fatal 1 "Could not download target $target's kernel SRPM $srpm using download_srpm-$DISTRO." - fi - fi - fi - else - fatal 1 "$srpm not found in directory $KERNELDIR." - fi - fi - + local target=$1 + local srpm=$2 + local force="${3:-false}" + + # let the download_file handle the concurrency + if $DOWNLOAD; then + local location= \ + "https://downloads.hpdd.intel.com/public/kernels/$target/old" + # get the location from a distro specific method if it exists + if type -p kernel_srpm_location; then + location=$(kernel_srpm_location) + fi + echo "Downloading $location/$srpm..." + if ! download_file \ + "$location/$srpm" "$KERNELDIR/$srpm" "$force" 2>&1 || + [ ! -s "$KERNELDIR/$srpm" ]; then + rm -f $KERNELDIR/$srpm + fatal 1 "Could not download target $target's kernel \ +SRPM $srpm from $location." + fi + fi } download_file() { @@ -555,40 +586,59 @@ download_file() { } download_ofed() { - local force="${1:-false}" - - if [ -z "$OFED_VERSION" -o "$OFED_VERSION" = "inkernel" ]; then - return 0 - fi - - local OFED_BASE_VERSION=$OFED_VERSION - if [[ $OFED_VERSION = *.*.*.* ]]; then - OFED_BASE_VERSION=${OFED_VERSION%.*} - fi - - local location="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/" - - if [[ $OFED_VERSION = *-rc[0-9] ]]; then - local Mmv - Mmv=${OFED_VERSION%%-*} - location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/" - fi - - if [[ $OFED_VERSION = daily-* ]]; then - local Mmv daily - OFED_VERSION=${OFED_VERSION/daily-/} - Mmv=${OFED_VERSION%%-*} - daily=${OFED_VERSION##$Mmv-} - location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}-daily/" - # find the filename for the version for the date specified - OFED_VERSION=$(curl -s "$location" | sed -nre "/${daily}-/s/.*href=\"OFED-(${Mmv//./\\.}-${daily}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1) - if [ -z "$OFED_VERSION" ]; then - fatal 1 "Could not determine the filename of the OFED snapshot for ${daily}" - fi - fi - - local file="OFED-${OFED_VERSION}.tgz" - download_file "$location/$file" "$KERNELTREE" "$force" + local ofed_type="$1" + local ofed_version="$2" + local force="${3:-false}" + local distro_name="${DISTRO}" + local arch="${TARGET_ARCH}" + local location + local file + + #if a src tarball has been given in the command line, we use it + #The format of the tarball must be OFED-${OFED_VERSION}.tgz + [ -n "${OFED_SRC}" ] && return 0 + + case $ofed_type in + ofa) + location="https://www.openfabrics.org/downloads/OFED/ofed-${ofed_version}/" + # version include RC + if [[ $ofed_version = *-[rR][cC][0-9] ]]; then + ofed_version_loc=${ofed_version%%-[rR][cC][0-9]} + location="https://www.openfabrics.org/downloads/OFED/ofed-${ofed_version_loc}/" + fi + # daily build + if [[ $ofed_version = *-daily ]]; then + ofed_version=${ofed_version/-daily/} + location="https://www.openfabrics.org/downloads/OFED/ofed-${ofed_version}-daily/" + # find the filename for latest version + ofed_version=$(curl -1 -s "$location" | sed -nre "s/.*href=\"OFED-(${ofed_version//./\\.}-[0-9]{8}-[0-9]{4}).tgz.*$/\1/p" | tail -1) + if [ -z "$ofed_version" ]; then + fatal 1 "Could not determine the filename of the OFED snapshot from daily " + fi + fi + + file="OFED-${ofed_version}.tgz" + download_file "$location/$file" "$KERNELTREE" "$force" + ;; + mlnx) + location="http://www.mellanox.com/downloads/ofed/MLNX_OFED-${ofed_version}" + # 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" + download_file "$location/$file" "$KERNELTREE" "$force" + ;; + ifs) + location="http://downloadmirror.intel.com/24625/eng/" + file="IntelIB-Basic.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.${ofed_version}.tgz" + download_file "$location/$file" "$KERNELTREE" "$force" + ;; + *) + fatal 1 "Error: unknown OFED type: $ofed_type" + + esac + # version might change due to detect daily version + OFED_VERSION=${ofed_version} } @@ -623,7 +673,7 @@ load_target() { # go away and the target just specify the $RPMSMPTYPE [ -z "$RPMSMPTYPE" ] && set_rpm_smp_type - # CC might have been overwriten in TARGET_FILE + # CC might have been overwritten in TARGET_FILE if [[ $CC != ccache\ * ]] && which "$CCACHE" &>/dev/null; then export CCACHE && export CC="ccache $CC" fi @@ -650,7 +700,7 @@ load_target() { 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${RPMSMPTYPE:+-}${RPMSMPTYPE}.config" + CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config" fi local lnxrelnew=${lnxrel//-/_} @@ -672,10 +722,6 @@ load_target() { # kernel. don't make it look like one if $PATCHLESS || [ -n "$SERIES" ]; then EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/") -# EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}" - if ! $PATCHLESS && [ -n "$BUILDID" ]; then - EXTRA_VERSION="${EXTRA_VERSION}.${BUILDID}" - fi fi fi # EXTRA_VERSION=${EXTRA_VERSION//-/_} @@ -696,18 +742,19 @@ load_target() { tarflags() { local file="$1" + echo -n '--wildcards ' case "$file" in '') fatal 1 "tarflags(): File name argument missing." ;; *.tar.gz | *.tgz) - echo 'zxf' + echo '-zxf' ;; *.tar.bz2) - echo 'jxf' + echo '-jxf' ;; *.tar) - echo 'xf' + echo '-xf' ;; *) fatal 1 "tarflags(): Unrecognized tar extension in file: $1" @@ -727,39 +774,67 @@ untar() { } unpack_ofed() { - - if ! untar "$KERNELTREE/OFED-${OFED_VERSION}.tgz"; then - return 1 - fi - [ -d OFED ] || ln -sf OFED-[0-9].[0-9]* OFED - + local ofed_type="$1" + local ofed_version="$2" + local distro_name="${DISTRO}" + local arch="${TARGET_ARCH}" + local file + + #if a src tarball has been given in the command line, we use it + #The format of the directory after untar MUST be in OFED-${version} + #even if it's from MLNX or IFS...or whatever + if [ -n "${OFED_SRC}" ]; then + if ! untar "$KERNELTREE/${OFED_SRC}"; then + return 1 + else + [ -d OFED ] || ln -sf OFED-[0-9].[0-9]* OFED + fi + fi + case $ofed_type in + ofa) + file="OFED-${ofed_version}" + if ! untar "$KERNELTREE/${file}.tgz"; then + return 1 + fi + [ -d OFED ] || ln -sf OFED-[0-9].[0-9]* OFED + ;; + mlnx) + # 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}" + + # 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 + # we need to untar again to get the src since it's being + # wrapped inside the tarball + # There are cases where the source version is different + # than the tarball. + # (ie. MLNX_OFED_LINUX-2.3-1.0.1 but MLNX_OFED_SRC-2.3-1.0.0) + local src=$(ls ${file}/src/MLNX_OFED_SRC-${ofed_version%.*}*.tgz) + if ! untar "$src"; then + return 1 + fi + [ -d OFED ] || ln -sf MLNX_OFED_SRC-[0-9].[0-9]* OFED + ;; + ifs) + file="IntelIB-Basic.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.${ofed_version}" + if ! untar "$KERNELTREE/${file}.tgz"; then + return 1 + fi + [ -d OFED ] || ln -sf $file/IntelIB-OFED.$(echo ${distro_name%%.*} | tr '[:lower:]' '[:upper:]')-${arch}.* OFED + ofed_version="$(cat OFED/Version)" + ;; + esac + # version might change due to detect daily version + OFED_VERSION=${ofed_version} } unpack_lustre() { - if [ -z "$LUSTRE" ]; then - local DATESTAMP="" - - if [ -n "$USE_DATESTAMP" ]; then - DATESTAMP="-D '$DATE'" - fi - - local DIRNAME="lustre-$TAG-$TIMESTAMP" - - cvs -d "$CVSROOT" -qz3 co $DATESTAMP -d "$DIRNAME" lustre || \ - fatal 1 "There was an error checking out toplevel Lustre from CVS." - pushd "$DIRNAME" > /dev/null - ./lustrecvs "$TAG" || \ - fatal 1 "There was an error checking out Lustre/Portals/Build from CVS." - echo "Creating lustre tarball..." - sh autogen.sh || fatal 1 "There was an error running autogen.sh." - ./configure --enable-dist || \ - fatal 1 "There was an error running ./configure to create makefiles." - make dist || fatal 1 "There was an error running 'make dist'." - LUSTRE=$PWD/lustre-*.tar.gz - popd > /dev/null - fi - untar "$LUSTRE" || fatal 1 "Error unpacking Lustre tarball" [ -d lustre ] || ln -sf lustre-[0-9].[0-9]* lustre @@ -802,190 +877,110 @@ do_patch_linux() { } -build_iokit() { - local rpmbuildopt="$1" - - pushd lustre-iokit > /dev/null || return 255 - - if ! ./configure; then - echo "failed to configure in lustre-iokit" - popd >/dev/null # pushd lustre-iokit - return 255 - fi - - if ! make dist; then - echo "failed to make dist in lustre-iokit" - popd >/dev/null # pushd lustre-iokit - return 255 - fi - - if ! $RPMBUILD $rpmbuildopt lustre-iokit*.tar.gz \ - --define "_tmppath /var/tmp" \ - --define "_topdir $TOPDIR" 2>&1; then - popd >/dev/null # pushd lustre-iokit - return 255 - fi - - if $DO_SRC && ! $RPMBUILD -ts lustre-iokit*.tar.gz \ - --define "_tmppath /var/tmp" \ - --define "_topdir $TOPDIR" 2>&1; then - popd >/dev/null # pushd lustre-iokit - return 255 - fi - popd >/dev/null # pushd lustre-iokit -} - build_lustre() { local linux="$1" local linuxobj="$2" + local configure_args="" cp "$LUSTRE" SOURCES pushd lustre >/dev/null - echo "Building Lustre RPMs for: $BUILD_ARCHS..." - local targets arch - for arch in $BUILD_ARCHS; do - targets="--target $arch $targets" - done - - local confoptions="" - - if $PATCHLESS; then - confoptions="$confoptions --disable-server" + if ! build_lustre_dkms; then + popd >/dev/null # pushd lustre + return 255 fi - local rpmbuildopt='-tb' - if $NORPM; then - rpmbuildopt='-tc' - echo NORPM mode. Only compiling. - fi + echo "Building Lustre RPMs for: $BUILD_ARCHS..." # If server we now build the spl and zfs modules against the lustre kernel. # These are required prior to the building of lustre server. Client does # not require spl/zfs. Use !PATCHLESS to indicate server which follows the # line above so is at least consistant. - if [ $PATCHLESS == false ] && [ "x$ZFSNOTSUPPORTED" == "x" ]; then + if [ $PATCHLESS == false ] && [ "x$WITH_ZFS" == "x" ]; then if ! build_spl_zfs; then popd >/dev/null # pushd lustre return 255 fi fi - ( $(skeep_ldiskfs_rpm $TAG) ) || { - - pushd ldiskfs > /dev/null || return 255 - - if ! ./configure --enable-dist; then - echo "failed to configure in ldiskfs" - popd >/dev/null # pushd ldiskfs - popd >/dev/null # pushd lustre - return 255 - fi - - if ! make dist 2>&1; then - popd >/dev/null # pushd ldiskfs - popd >/dev/null # pushd lustre - return 255 - fi - - #cp lustre-ldiskfs*.tar.gz $TOPDIR/SOURCES || \ - # fatal 1 "Could not copy lustre-ldiskfs*.tar.gz to $TOPDIR/SOURCES" - - if ! $RPMBUILD $targets $rpmbuildopt lustre-ldiskfs*.tar.gz \ - --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \ - --define "kdir $linux" \ - ${linuxobj:+--define "kobjdir $linuxobj"} \ - --define "_tmppath /var/tmp" \ - --define "_topdir $TOPDIR" 2>&1; then - popd >/dev/null # pushd ldiskfs - popd >/dev/null # pushd lustre - return 255 - fi - - if $DO_SRC; then - if ! $RPMBUILD -ts lustre-ldiskfs*.tar.gz \ - --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \ - --define "kdir $linux" \ - ${linuxobj:+--define "kobjdir $linuxobj"} \ - --define "_tmppath /var/tmp" \ - --define "_topdir $TOPDIR" 2>&1; then - popd >/dev/null # pushd ldiskfs - popd >/dev/null # pushd lustre - return 255 - fi - fi - popd >/dev/null # pushd ldiskfs - - # tell lustre where ldiskfs is - # XXX - pointing to the RPM BUILD dir is a hack. we need to flesh - # out the ldiskfs RPM build so that it builds a - # lustre-ldiskfs-devel RPM and install that and point lustre - # to that instead - confoptions="$confoptions --with-ldiskfs=$(ls -d $TOPDIR/BUILD/lustre-ldiskfs-*)" - } - - if $IOKITRPM; then - if ! build_iokit $rpmbuildopt; then - echo "failed to build lustre-iokit" - popd >/dev/null # pushd lustre - return 255 - fi - fi - - # convert the $PATCHLESS boolean to an empty/not-empty boolean - # as silly as this seems, it makes the syntax of the rpmbuild command - # simpler and not need an eval to deal with the quotes in the quotes - local is_patchless="" if $PATCHLESS; then - is_patchless="yes" + configure_args="$configure_args --disable-server" fi # ditto for the lustre-tests boolean - local lustre_tests="" if ! $LUSTRE_TESTS; then - lustre_tests="no" + configure_args="$configure_args --disable-tests" + fi + + if ! $IOKITRPM; then + configure_args="$configure_args --disable-iokit" fi - local osd_zfs="" - if $OSDZFSRPM; then - osd_zfs="yes" + if ! $OSDZFSRPM; then + configure_args="$configure_args --without-zfs" fi - local osd_ldiskfs="" - if $OSDLDISKFSRPM; then - osd_ldiskfs="yes" + if ! $OSDLDISKFSRPM; then + configure_args="$configure_args --disable-ldiskfs" fi - $RPMBUILD $targets $rpmbuildopt "$LUSTRE" \ - ${is_patchless:+--define "lustre_name lustre-client"} \ - ${lustre_tests:+--define "build_lustre_tests 0"} \ - ${osd_zfs:+--define "build_lustre_osd_zfs 1"} \ - ${osd_ldiskfs:+--define "build_lustre_osd_ldiskfs 1"} \ - ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ - --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \ - --define "kdir $linux" \ - ${linuxobj:+--define "kobjdir $linuxobj"} \ - --define "_tmppath $TMPDIR" \ - --define "_topdir $TOPDIR" 2>&1 || \ + configure_args="$configure_args --with-linux=$linux" + configure_args="$configure_args ${linuxobj:+--with-linux-obj=$linuxobj}" + + # allow environment setting to override ldiskfs series selection + [ -n "$LDISKFS_SERIES" ] && export LDISKFS_SERIES + + ./configure $configure_args $CONFIGURE_FLAGS 2>&1 || + fatal 1 "Error in configure." + # until we have achieved full kABI compatibility we need to + # restrict the kernel range that can be used to the kernel + # version from the RHEL minor release + # this is supposed to be done for kmods automatically but + # RHBZ#1467319 seems to be getting in the way + local kver=$(find_linux_release) + local linuxversion=${kver%%-*} + local linuxrelease=${kver##*-} + local kabiminor=${linuxrelease%%.*} + echo "Requires: kernel < $linuxversion-$((kabiminor+1)), kernel >= $linuxversion-$((kabiminor))" >> rpm/kmp-lustre.preamble + make rpms 2>&1 || fatal 1 "Error building rpms for $BUILD_ARCHS." - if $DO_SRC; then - if ! $RPMBUILD -ts "$LUSTRE" \ - ${is_patchless:+--define "lustre_name lustre-client"} \ - ${lustre_tests:+--define "build_lustre_tests 0"} \ - ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ - --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \ - --define "kdir $linux" \ - ${linuxobj:+--define "kobjdir $linuxobj"} \ - --define "_tmppath $TMPDIR" \ - --define "_topdir $TOPDIR" 2>&1; then - popd - return 255 - fi - fi + # move RPMs into place where they are expected to be + for arch in $BUILD_ARCHS; do + mv -f *lustre*.${arch}.rpm $TOPDIR/RPMS/${arch}/ + done + mv -f lustre-*.src.rpm $TOPDIR/SRPMS/ + popd >/dev/null + if type -p cleanup_rpmmacros; then + cleanup_rpmmacros + fi + 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: $BUILD_ARCHS..." + ./configure --enable-dist || fatal 1 "Error in DKMS configure." + + 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 $BUILD_ARCHS." + rpmbuild --define "_topdir $TOPDIR" $build_args \ + --rebuild $TOPDIR/SRPMS/$name_prefix-dkms-$ver-*.src.rpm || + fatal 1 "Error building DKMS .rpm for $BUILD_ARCHS." + + return 0 } ### @@ -1008,11 +1003,11 @@ 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.6.1} - SPLZFSTAG=${SPLZFSTAG:-lustre-zfs} + SPLZFSVER=${SPLZFSVER:-0.6.5.9} + SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . - local kver=$(find_linux_release ${LINUX}) + local kver=$(find_linux_release) # build and install the spl and zfs (and -devel) RPMs for lustre to use local pkg @@ -1020,33 +1015,35 @@ build_spl_zfs() { local rpmpkg - [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*/|tail -1)" + [ "$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 - git clone ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1 + git clone -n ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1 - pushd $pkg || return 255 + pushd $pkg || return 255 + local tag if [ -n "$SPLZFSTAG" ]; then - git checkout $SPLZFSTAG + tag=$SPLZFSTAG else - git checkout -b lbuild $pkg-$SPLZFSVER + tag=$pkg-$SPLZFSVER 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 + # 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 + specdir=rpm/generic + speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec" + fi - sh autogen.sh || return 255 + sh autogen.sh || return 255 - if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUX} \ + if ! ./configure --with-linux=${LINUX} --with-linux-obj=${LINUXOBJ:-$LINUX} \ ${spldir:+--with-spl="${spldir}"} 2>&1 || ! make dist 2>&1; then popd @@ -1056,40 +1053,37 @@ build_spl_zfs() { 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 + if [ -f $pkg/scripts/kmodtool ]; then + ln -f $pkg/scripts/kmodtool $TOPDIR/SOURCES/ + fi - local rpmb - if $DO_SRC; then - rpmb=-ba - else - rpmb=-bb - fi + local rpmb + if $DO_SRC; then + rpmb=-ba + else + rpmb=-bb + fi - # 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 "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 $(find_linux_builddir $LINUX)" \ - --define "_topdir $TOPDIR" 2>&1; then - 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 - -# $DO_SRC && mv $pkg*.src.rpm $TOPDIR/SRPMS/ -# mv $pkg*.noarch.rpm $TOPDIR/RPMS/noarch/ -# mv *$pkg*.$TARGET_ARCH.rpm $TOPDIR/RPMS/$(basearch $TARGET_ARCH)/ + 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 @@ -1097,13 +1091,29 @@ build_spl_zfs() { # cpio only extract to pwd so we need to go there. pushd $TOPDIR - local rpm - for rpm in $rpms; do + local rpm + for rpm in $rpms; do rpm2cpio $rpm | cpio -id - done + 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}" + fi popd - CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*/|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 @@ -1120,36 +1130,15 @@ stage() { rpmdir="${STAGEDIR}/${CANONICAL_TARGET}-${arch}" echo "${0##*/}: Copying RPMs into ${rpmdir}" mkdir -p "${rpmdir}" - cp -v RPMS/${arch}/*.rpm "${rpmdir}" - if [ -d RPMS/noarch ]; then - cp -v RPMS/noarch/*.rpm "${rpmdir}" - fi + for rpm in $(ls RPMS/${arch}/*.rpm RPMS/noarch/*.rpm); do + cp -v $rpm "${rpmdir}" + done done cp -v "$LUSTRE" "$STAGEDIR" } -#check if we need to build separate ldiskfs RPM -skeep_ldiskfs_rpm() { - local tag="$1" - - local skip=false - - if ! $LDISKFSRPM; then - skip=true - elif $PATCHLESS; then - skip=true - else - for skiptag in $SKIPLDISKFSRPM; do - [[ $tag == $skiptag ]] && skip=true && break - done - fi - - echo $skip - -} - set_rpm_smp_type() { local infact_arch="${TARGET_ARCH}" @@ -1176,26 +1165,25 @@ set_rpm_smp_type() { } -# This function takes a linux source pool and digs out the linux release -# from it -find_linux_release() { - local SRCDIR="$1" +# This function takes a linux include tree and digs out the linux release +# from it. It is never called directly, only called from the distro +# specific function find_linux_release() in lbuild-{rhel,sles}. +_find_linux_release() { + local SRC="$1" + local LINUXRELEASEHEADER="" - local LINUXRELEASEHEADER=$SRCDIR/include/linux/version.h - if [ -s $SRCDIR/include/linux/utsrelease.h ]; then - LINUXRELEASEHEADER=$SRCDIR/include/linux/utsrelease.h + LINUXRELEASEHEADER=$SRC/include/linux/version.h + if [ -s $SRC/include/generated/utsrelease.h ]; then + LINUXRELEASEHEADER=$SRC/include/generated/utsrelease.h + elif [ -s $SRC/include/linux/utsrelease.h ]; then + LINUXRELEASEHEADER=$SRC/include/linux/utsrelease.h fi - sed -ne 's/#define UTS_RELEASE "\(.*\)"$/\1/p' $LINUXRELEASEHEADER -} - -# This funcition finds the buildroot directory for a given linux -# kernel directory -find_linux_builddir() { - local linux=${1:-${LINUX}} - local rel=$(find_linux_release $linux) + if [ ! -s $LINUXRELEASEHEADER ]; then + fatal 1 "could not find UTS_RELEASE" + fi - echo ${linux%/usr/src/kernels/${rel}*} + sed -ne 's/#define UTS_RELEASE "\(.*\)"$/\1/p' $LINUXRELEASEHEADER } # unpack kernel(/source/devel) RPM @@ -1217,8 +1205,8 @@ unpack_linux_devel_rpm() { fi # call a distro specific hook, if available - if type -p unpack_linux_devel_rpm-$DISTRO; then - if ! unpack_linux_devel_rpm-$DISTRO "$kernelrpm"; then + if type -p unpack_linux_devel_rpm-$DISTROMAJ; then + if ! unpack_linux_devel_rpm-$DISTROMAJ "$kernelrpm"; then return 255 fi fi @@ -1235,22 +1223,25 @@ build_kernel_ib() { local linux="$1" local kib_prefix="$2" local kib_rpm="$3" + local ofed_type="${4}" + local ofed_version="${5}" # build kernel-ib{,-devel}/compat-rdma{,-devel} local K_SRC="K_SRC" - # ofed 1.3 had a bug in the rpm spec - if [ "$OFED_VERSION" = "1.3" ]; then - K_SRC="KSRC" - fi - local OFED_CORE="--with-core-mod --with-ipoib-mod --with-sdp-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod" - local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod --with-mlx4_en-mod --with-cxgb3-mod --with-nes-mod" + 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" - if compare_version $OFED_VERSION 3.0; then - OFED_CORE="$OFED_CORE --with-madeye-mod --with-rds-mod" - else - OFED_HARDWARE="$OFED_HARDWARE --with-cxgb4-mod" - fi + # 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 # some I/B drivers are architecture dependent and kernel-ib's configure # does not figure it out for us ~sigh~ @@ -1273,12 +1264,12 @@ build_kernel_ib() { local SOURCE="${TOPDIR}/OFED/SRPMS/${kib_prefix}-*.src.rpm" # but switch to building from the SPEC if we need to apply patches - if ls ${TOPDIR}/lustre/build/patches/ofed/* >/dev/null; then + if ls ${TOPDIR}/lustre/contrib/patches/ofed/* >/dev/null; then BUILD_TYPE="-bb" 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/build/patches/ofed/*.patch); do + for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.patch); do ed_fragment1="$ed_fragment1 Patch$n: ${file%%*/}" ed_fragment2="$ed_fragment2 @@ -1286,9 +1277,9 @@ Patch$n: ${file%%*/}" cp $file ${TOPDIR}/SOURCES let n=$n+1 done - for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*.ed); do + for file in $(ls ${TOPDIR}/lustre/contrib/patches/ofed/*.ed); do # Only apply the ed-scripts that should be used for the canonical target - # ed-files in ${TOPDIR}/lustre/build/patches/ofed/ have to follow the naming + # ed-files in ${TOPDIR}/lustre/contrib/patches/ofed/ have to follow the naming # convention # -:: ...:.ed # To apply the same change to multiple canonical target simply specify @@ -1316,21 +1307,36 @@ EOF fi fi - local linuxrelease=$(find_linux_release "$linux") - if compare_version $OFED_VERSION 3.0; then - local OFA_KERNEL_RELEASE=$(echo -n ${linuxrelease} | sed -e 's/-/_/g') - fi - if ! $RPMBUILD $BUILD_TYPE --define 'build_kernel_ib 1' --define 'build_kernel_ib_devel 1' \ - ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ - --define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \ - --define "KVERSION ${linuxrelease}" \ - --define "$K_SRC ${linux}" \ - --define "LIB_MOD_DIR /lib/modules/${linuxrelease}/updates" \ - ${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 + local linuxrelease=$(find_linux_release) + # a place to change/add any unique config + case $ofed_type in + ofa|ifs) local K_SRC_OBJ="K_SRC_OBJ" + if ! $RPMBUILD $BUILD_TYPE --define 'build_kernel_ib 1' \ + --define 'build_kernel_ib_devel 1' \ + ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ + --define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \ + --define "KVERSION ${linuxrelease}" \ + --define "$K_SRC ${linux}" \ + ${K_SRC_OBJ:+--define "$K_SRC_OBJ ${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 + ;; + mlnx) + if ! $RPMBUILD $BUILD_TYPE \ + ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \ + --define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \ + --define "KVERSION ${linuxrelease}" \ + --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 + ;; + esac } @@ -1480,8 +1486,12 @@ build_kernel_with_srpm() { if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then local REUSE_SIGNATURE=$({ echo -en $release_str; echo $BUILD_GEN; - cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH; - cat ${0%/lbuild}/lbuild ${0%/lbuild}/lbuild-${DISTRO}; } | + cat "$CONFIG_FILE"; + cat "$TARGET_FILE" | + sed -e '/_VERSION=/s/_[0-9]*_g.*$//g'; + cat "$FULL_PATCH"; + cat "$LBUILD_DIR/lbuild"; + cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | md5sum | cut -d" " -f1) # see if we can link to the reuse pool # XXX - hrm. i'm not convinced this doesn't belong in the reuse @@ -1500,10 +1510,8 @@ build_kernel_with_srpm() { if ! $USE_BUILD_CACHE || ! reuse kernel "$TOPDIR" "$CAN_LINK_FOR_REUSE" \ "$REUSE_SIGNATURE"; then # nothing cached, build from scratch - if [ ! -r "$KERNELDIR/$KERNEL_SRPM" ]; then - echo "Downloading kernel SRPM" >&${outfd} - download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM" >&${outfd} - fi + echo "Downloading kernel SRPM" >&${outfd} + download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM" >&${outfd} if ! rpm -ivh $KERNELDIR/$KERNEL_SRPM \ --define "_topdir $TOPDIR" >&${outfd} 2>&1; then @@ -1534,7 +1542,7 @@ build_kernel_with_srpm() { # figure out the EXTRA_VERSION of the kernel we built or are re-using local KERNEL_RPM - if ! KERNEL_RPM=$(find_rpm "$TOPDIR/RPMS/$TARGET_ARCH/" provides "^kernel ="); then + if ! KERNEL_RPM=$(find_rpm "$TOPDIR/RPMS/$TARGET_ARCH/" provides "^kernel(-default)? ="); then fatal 1 "Failed to find a kernel RPM in $TOPDIR/RPMS/$TARGET_ARCH/" fi kernel_extra_version=$(rpm -q --queryformat "%{RELEASE}" -p $TOPDIR/RPMS/$TARGET_ARCH/$KERNEL_RPM) @@ -1558,16 +1566,14 @@ build_kernel_with_srpm() { # CONFIGURE_FLAGS build_ofed() { - local linux="$1" - local ofed_version="$2" - local kib_prefix - local kib_rpm - - # if an ofed version is given, then it means use OFED proper, - # not any vendor specific "inkernel" version - if [ -z "$ofed_version" ]; then - return 0 - fi + local linux="$1" + local ofed_type="$2" + local ofed_version="$3" + local kib_prefix + local kib_rpm + local pre_prefix + local o2ib_location + local rpm if [ "$ofed_version" = "inkernel" ]; then # see if there is a distro specific override for this and use @@ -1575,31 +1581,42 @@ build_ofed() { # XXX we need to better integrate a distro specific override with # the rest of this function so that all of the reuse cache # stuff is leveraged given that 80% of this function is reuse - if type -p build_ofed-${DISTRO}; then + if type -p build_ofed-$DISTROMAJ; then local ofed_location - ofed_location=$(build_ofed-${DISTRO} ${STDOUT}) + ofed_location=$(build_ofed-$DISTROMAJ ${STDOUT}) local rc=${PIPESTATUS[0]} CONFIGURE_FLAGS="--with-o2ib=${ofed_location} ${CONFIGURE_FLAGS}" return $rc else return 0 fi - elif compare_version $OFED_VERSION 3.0; then - kib_prefix="ofa_kernel" - kib_rpm="kernel-ib" - else - kib_prefix="compat-rdma" - kib_rpm="compat-rdma" - fi + else + case $ofed_type in + mlnx) # no compat-rdma for mlnx as of 3.1 + kib_prefix="ofa_kernel" + pre_prefix="mlnx-" + kib_rpm="${pre_prefix}${kib_prefix}" + ;; + ofa|ifs) + if compare_version $ofed_version 3.0; then + kib_prefix="ofa_kernel" + kib_rpm="${pre_prefix}${kib_prefix}" + else + kib_prefix="compat-rdma" + kib_rpm="compat-rdma" + fi + ;; + esac + fi # build kernel-ib/compat-rdma if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then local REUSE_SIGNATURE=$({ echo "$ofed_version"; - echo "$(find_linux_release ${linux}; + echo "$(find_linux_release; echo "$BUILD_GEN")"; cat "${linux}/include/linux/autoconf.h"; - cat "${0%/lbuild}/lbuild" ; - cat "${0%/lbuild}/lbuild-${DISTRO}"; } | + cat "$LBUILD_DIR/lbuild"; + cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | md5sum | cut -d" " -f1) # see if we can link to the reuse pool # XXX - hrm. i'm not convinced this doesn't belong in the reuse @@ -1627,7 +1644,7 @@ build_ofed() { create_rpmbuild_dirs fi # build it - build_kernel_ib "${linux}" "${kib_prefix}" "${kib_rpm}" + build_kernel_ib "${linux}" "${pre_prefix}${kib_prefix}" "${kib_rpm}" "${ofed_type}" if [ -z "$REUSE_SIGNATURE" ]; then echo "No reuse signature was caculated so not storing the built ofed" @@ -1650,21 +1667,42 @@ build_ofed() { rm -rf ${kib_rpm}-devel mkdir ${kib_rpm}-devel cd ${kib_rpm}-devel - # the actual ofed RPMs don't have the -rc$n or -$date string appened that - # might be present on the file - local linuxrelease=$(find_linux_release "$linux") - ofed_version=$(echo $ofed_version | - sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//') - local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version}-${linuxrelease//-/_}.*.rpm) - if ! rpm2cpio < $rpm | cpio -id; then - fatal 1 "could not unpack the ${kib_rpm}-devel rpm." - fi - CONFIGURE_FLAGS="--with-o2ib=$(pwd)/usr/src/${kib_prefix} ${CONFIGURE_FLAGS}" - popd >/dev/null + + o2ib_location="$(pwd)/usr/src/${kib_prefix}" + case $ofed_type in + mlnx) # Prior to MOFED 3.1, we had to use build_kernel_ib=1 to + # build devel rpm. not so after 3.1 + if compare_version $ofed_version 3.0; then + rpm=$(ls $TOPDIR/RPMS/*/kernel-ib-devel-${ofed_version%%-*}-*.rpm) + else + rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version%%-*}-*.rpm) + fi + o2ib_location="${o2ib_location}/default" + ;; + ofa) # Prior to OFA 3.18, we had to use build_kernel_ib=1 during configure, + # not so after 3.18 + if compare_version $ofed_version 3.18; then + rpm=$(ls $TOPDIR/RPMS/*/kernel-ib-devel-${ofed_version%%-*}-*.rpm) + else + rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version%%-*}-*.rpm) + fi + ;; + ifs) # ifs doesn't follow any convention (if any) + rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-*.rpm) + ;; + esac + + if ! rpm2cpio < $rpm | cpio -id; then + fatal 1 "could not unpack the $rpm." + fi + CONFIGURE_FLAGS="--with-o2ib=${o2ib_location} ${CONFIGURE_FLAGS}" + popd >/dev/null } build_with_srpm() { + local ofed_type="$1" + local ofed_version="$2" if ! $PATCHLESS; then local kernel_extra_version @@ -1689,7 +1727,7 @@ build_with_srpm() { # client build local kernelrpm if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE"); then - fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in ${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}" + fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in $KERNELRPMSBASE/$lnxmaj/$DISTROMAJ" fi if ! lnxrel="$lnxrel" unpack_linux_devel_rpm "$kernelrpm" "-"; then fatal 1 "Could not find the Linux tree in $kernelrpm" @@ -1700,7 +1738,7 @@ build_with_srpm() { # infrastructure files so that find-requires can find our unpacked # kernel-devel artifacts cp $RPM_HELPERS_DIR/{symset-table,find-requires{,.ksyms}} . - FIND_REQUIRES="$(pwd)/find-requires" + export FIND_REQUIRES="$(pwd)/find-requires" chmod 755 {symset-table,find-requires{,.ksyms}} local tmp="$(pwd)" tmp="${tmp//\//\\/}" @@ -1717,6 +1755,7 @@ EOF set -x . g/\/.*\/\(symset-table\)/s//$tmp\/\1/g +g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g wq EOF ed symset-table <