X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=0cf39bad9912e7e4133d671ef0eaf081e462a19f;hp=bd374fa2ce03707531d4e46cfb283cfa691093be;hb=527b2cd8e593b52326519d13418daf34b6b53b0e;hpb=7be4dc66a8b14b7530e7396549da078f8d43720c diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index bd374fa..0cf39ba 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -36,7 +36,7 @@ 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" KERNELDIR= LINUX= @@ -60,6 +60,8 @@ EXTRA_VERSION= STAGEDIR= TMPDIR=${TMPDIR:-"/var/tmp"} TIMESTAMP= +# 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? @@ -174,6 +176,24 @@ Usage: ${0##*/} [OPTION]... [-- ] 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 Build with ldiskfs support. (Deprecated, always true) @@ -262,6 +282,23 @@ check_options() { 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 @@ -284,7 +321,7 @@ check_options() { fi case $TARGET in - 3.12-sles12) + 3.12-sles12 | 4.4-sles12) CANONICAL_TARGET="sles12" ;; 3.10-rhel7) @@ -333,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 @@ -370,7 +423,6 @@ check_options() { fi return 0 - } # compare two versions $1 and $2. if $1 < $2, return 0 otherwise return 1. @@ -392,8 +444,7 @@ compare_version () { return 1 fi done - - return 0 + return 1 } uniqify() { @@ -432,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="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 ! 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-$DISTROMAJ; then - fatal 1 "Could not download target $target's kernel SRPM $srpm from $location." - else - if ! download_srpm-$DISTROMAJ "$target" "$srpm" "$force"; then - fatal 1 "Could not download target $target's kernel SRPM $srpm using download_srpm-$DISTROMAJ." - 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() { @@ -544,39 +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="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/" - - if [[ $OFED_VERSION = *-[rR][cC][0-9] ]]; then - local Mmv - Mmv=${OFED_VERSION%%-[rR][cC][0-9]} - location="https://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/" - fi - - if [[ $OFED_VERSION = daily-* ]]; then - local Mmv - Mmv=${OFED_VERSION/daily-/} - daily=${OFED_VERSION##$Mmv-} - location="https://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 "/${Mmv}-/s/.*href=\"OFED-(${Mmv}-[0-9]{8,8}-[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} } @@ -712,12 +774,63 @@ 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() { @@ -820,33 +933,53 @@ build_lustre() { ./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." # move RPMs into place where they are expected to be for arch in $BUILD_ARCHS; do - mv -f lustre-*.${arch}.rpm $TOPDIR/RPMS/${arch}/ + 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 ver=$(eval echo $(awk '/LUSTRE_VERSION_STRING/ {print $3}' lustre/include/lustre_ver.h)) + 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 || return 255 + ./configure --enable-dist || fatal 1 "Error in DKMS configure." if $PATCHLESS; then - $RPMBUILD --define="_topdir $TOPDIR" --without servers -bs lustre-dkms.spec || return 255 - $RPMBUILD --rebuild --define="_topdir $TOPDIR" --without servers $TOPDIR/SRPMS/lustre-client-dkms-$ver-*.src.rpm || return 255 - else - $RPMBUILD --define="_topdir $TOPDIR" -bs lustre-dkms.spec || return 255 - $RPMBUILD --rebuild --define="_topdir $TOPDIR" $TOPDIR/SRPMS/lustre-dkms-$ver-*.src.rpm || return 255 + 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 } @@ -870,7 +1003,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.6.4.2} + SPLZFSVER=${SPLZFSVER:-0.6.5.9} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . @@ -882,18 +1015,20 @@ 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 - if [ -n "$SPLZFSTAG" ]; then - git checkout $SPLZFSTAG - else - git checkout -b lbuild $pkg-$SPLZFSVER - fi + pushd $pkg || return 255 + local tag + if [ -n "$SPLZFSTAG" ]; then + tag=$SPLZFSTAG + else + 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 @@ -935,8 +1070,9 @@ build_spl_zfs() { # Manually build rpms for spec in $speclist; do echo "Building RPMs from $pkg/$specdir/$spec" - if ! $RPMBUILD $rpmb $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}"} \ @@ -977,7 +1113,7 @@ build_spl_zfs() { 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 @@ -1087,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-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 --with-qib-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-mlx5-mod --with-cxgb4-mod --with-ocrdma-mod --with-qib-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~ @@ -1169,20 +1308,35 @@ EOF fi local linuxrelease=$(find_linux_release) - 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 + # 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 } @@ -1333,7 +1487,8 @@ build_kernel_with_srpm() { local REUSE_SIGNATURE=$({ echo -en $release_str; echo $BUILD_GEN; cat "$CONFIG_FILE"; - cat "$TARGET_FILE"; + cat "$TARGET_FILE" | + sed -e '/_VERSION=/s/_[0-9]*_g.*$//g'; cat "$FULL_PATCH"; cat "$LBUILD_DIR/lbuild"; cat "$LBUILD_DIR/lbuild-$DISTROMAJ"; } | @@ -1355,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 @@ -1413,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 @@ -1439,13 +1590,24 @@ build_ofed() { 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 @@ -1482,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" @@ -1505,31 +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) - #ofed_version=$(echo $ofed_version | - # sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//') - # FIXME - # OFED version will have 'hyphen' for minor release. (e.g. 3.5-1, instead - # of 3.5.1) compat-rdma and compat-rdma-devel could have same version - # number, but currectly not. Once OFED fix this in the future release, we - # can remove following filter. - #ofed_version=$(echo $ofed_version | - # sed -re 's/-([0-9]*-[rR][cC][0-9]*)$//') - #local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-${ofed_version}-${linuxrelease//-/_}.*.rpm) - # I dont' know why we have gone through the trouble to filter out the name - # of the rpm there should only be one ${kib_rpm}-devel built - local rpm=$(ls $TOPDIR/RPMS/*/${kib_rpm}-devel-*.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 @@ -1565,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//\//\\/}" @@ -1582,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 <