X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=contrib%2Flbuild%2Flbuild;h=db3795fcb66a3cced2a1f78ed51fc5b0739f7b8e;hp=f4f43d5a27bd87d222df3af8e5f64733176a4eaf;hb=d27a0b0cfd35dc7a29cd1ec6d5aef5a60ec82ba0;hpb=4852e26a1344c407ec8a13e4d3bc77fe7a590c52 diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index f4f43d5..db3795f 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -29,12 +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=1 -#BUILD_GEN=2 # bz19952: remove -lustre tag from kernel RPM names -#BUILD_GEN=3 # bz19975: enable the building of src.rpms by default -#BUILD_GEN=4 # bz22281: use the git hash in the kernel extra version -#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 +BUILD_GEN=8 TOPDIR="$PWD" @@ -50,16 +45,14 @@ DOWNLOAD=true CANONICAL_TARGET= TARGET= TARGET_ARCH="$(uname -m)" -# change default behavior to only build for the current arch -TARGET_ARCHS="$TARGET_ARCH" -TARGET_ARCHS_ALL="$TARGET_ARCH" -[ "$TARGET_ARCH" = "i686" ] && TARGET_ARCHS_ALL="i686 i586 i386" CONFIGURE_FLAGS= EXTERNAL_PATCHES= 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? @@ -70,6 +63,7 @@ OSDLDISKFSRPM=true OSDZFSRPM=false SMPTYPES="smp bigsmp default ''" PATCHLESS=false +PATCHLESS_SERVER=false WITH_ZFS="" XEN=false LINUXOBJ= @@ -103,6 +97,8 @@ LUSTRE_TESTS=true DATE=$(date) +RPMBUILD= + export CC=${CC:-gcc} # Readlink is not present on some older distributions: emulate it. @@ -147,6 +143,9 @@ Usage: ${0##*/} [OPTION]... [-- ] --patchless Build lustre client only + --patchless-server + Build lustre server without patching the kernel + --distro=DISTRO Which distro using. Autodetect by default @@ -172,6 +171,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) @@ -200,16 +217,6 @@ Usage: ${0##*/} [OPTION]... [-- ] The name of the target to build. The available targets are listed below. - --target-archs=TARGET_ARCHS - A (space delimited) list of architectures to build. By default, - all of the archs supported by the TARGET will be built, in - addition to a .src.rpm. This option can limit those, for machines - that can only build certain archs or if you only want a certain - arch built (for testing, or a one-off kernel). - - Also note that by using a non-"base" arch (eg, i386) only kernels - will be built - there will be no lustre-lite-utils package. - --xen Builds a Xen domX kernel. @@ -260,6 +267,27 @@ check_options() { usage 1 "Could not find Lustre source tarball '$LUSTRE'." fi + if $PATCHLESS && $PATCHLESS_SERVER; then + usage 1 "Can not use both --patchless and --patchless-server." + 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 @@ -282,10 +310,10 @@ check_options() { fi case $TARGET in - 3.12-sles12) + 3.12-sles12 | 4.4-sles12) CANONICAL_TARGET="sles12" ;; - 3.10-rhel7) + 3.10-rhel7*) CANONICAL_TARGET="rhel7" ;; 2.6-rhel6*) @@ -331,7 +359,7 @@ check_options() { TIMESTAMP=$(date -d "$DATE" "+%Y%m%d%H%M%S") fi - local RPMBUILD=$(which rpmbuild 2>/dev/null | head -n 1) + 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)." @@ -405,8 +433,7 @@ compare_version () { return 1 fi done - - return 0 + return 1 } uniqify() { @@ -468,6 +495,26 @@ SRPM $srpm from $location." fi } +download_debuginfo_common() { + local rpm=$1 + local force="${2:-false}" + + # let the download_file handle the concurrency + if $DOWNLOAD; then + # get the location from a distro specific method if it exists + if type -p kernel_debuginfo_location; then + location=$(kernel_debuginfo_location) + fi + echo "Downloading $location/$rpm" + if ! download_file \ + "$location/$rpm" "$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$rpm" "$force" 2>&1 || + [ ! -s "$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$rpm" ]; then + rm -f $KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$rpm + fatal 1 "Could not download $rpm from $location." + fi + fi +} + download_file() { local from="$1" local to="$2" @@ -548,39 +595,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} } @@ -667,18 +734,6 @@ load_target() { fi fi # EXTRA_VERSION=${EXTRA_VERSION//-/_} - - ALL_ARCHS="$BASE_ARCHS $BIGMEM_ARCHS $BOOT_ARCHS $JENSEN_ARCHS $SMP_ARCHS $BIGSMP_ARCHS $PSERIES64_ARCHS $UP_ARCHS" - - BUILD_ARCHS= - for arch in $(uniqify "$ALL_ARCHS"); do - if [ -z "$TARGET_ARCHS" ] || - [[ \ $TARGET_ARCHS\ = *\ $arch\ * ]]; then - BUILD_ARCHS="$BUILD_ARCHS $arch" - fi - done - [ "$BUILD_ARCHS" ] || usage 1 "No available target archs to build." - echo "Building for: $BUILD_ARCHS" } tarflags() { @@ -716,12 +771,64 @@ 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 + [ -d OFED_RPMS ] || ln -sf ${file}/RPMS OFED_RPMS + ;; + 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() { @@ -782,7 +889,7 @@ build_lustre() { return 255 fi - echo "Building Lustre RPMs for: $BUILD_ARCHS..." + echo "Building Lustre RPMs for: $TARGET_ARCH" # 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 @@ -824,13 +931,16 @@ build_lustre() { ./configure $configure_args $CONFIGURE_FLAGS 2>&1 || fatal 1 "Error in configure." + + if type -p apply_kmod_requires_conflicts; then + apply_kmod_requires_conflicts + fi + make rpms 2>&1 || - fatal 1 "Error building rpms for $BUILD_ARCHS." + fatal 1 "Error building rpms for $TARGET_ARCH." # 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*.${TARGET_ARCH}.rpm $TOPDIR/RPMS/${TARGET_ARCH}/ mv -f lustre-*.src.rpm $TOPDIR/SRPMS/ popd >/dev/null @@ -841,25 +951,45 @@ 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: $BUILD_ARCHS..." + echo "Building Lustre DKMS RPMs for: $TARGET_ARCH" ./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." + fatal 1 "Error building DKMS .src.rpm for $TARGET_ARCH." + + 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 } @@ -884,7 +1014,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.5.7} + SPLZFSVER=${SPLZFSVER:-0.7.9} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . @@ -900,14 +1030,16 @@ build_spl_zfs() { # 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 - - pushd $pkg || return 255 - if [ -n "$SPLZFSTAG" ]; then - git checkout $SPLZFSTAG - else - git checkout -b lbuild $pkg-$SPLZFSVER - fi + git clone -n ${SPLZFSGITREPO:-"https://github.com/zfsonlinux"}/$pkg.git $pkg 2>&1 + + 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 @@ -1005,13 +1137,11 @@ stage() { [ "$STAGEDIR" ] || return 0 - for arch in $BUILD_ARCHS; do - rpmdir="${STAGEDIR}/${CANONICAL_TARGET}-${arch}" - echo "${0##*/}: Copying RPMs into ${rpmdir}" - mkdir -p "${rpmdir}" - for rpm in $(ls RPMS/${arch}/*.rpm RPMS/noarch/*.rpm); do - cp -v $rpm "${rpmdir}" - done + rpmdir="${STAGEDIR}/${CANONICAL_TARGET}-${TARGET_ARCH}" + echo "${0##*/}: Copying RPMs into ${rpmdir}" + mkdir -p "${rpmdir}" + for rpm in $(ls RPMS/${TARGET_ARCH}/*.rpm RPMS/noarch/*.rpm); do + cp -v $rpm "${rpmdir}" done cp -v "$LUSTRE" "$STAGEDIR" @@ -1067,10 +1197,6 @@ _find_linux_release() { # unpack kernel(/source/devel) RPM # -# This function and it's setting of $LINUX and $LINUXOBJ is a total hack that -# needs to completely refactored. It completely ingores that $BUILD_ARCHS may -# contain a list of arches for which rpmbuild commands (including the one for -# lustre itself) unpack_linux_devel_rpm() { local kernelrpm="${1}" @@ -1102,22 +1228,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~ @@ -1184,19 +1313,40 @@ 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' \ - --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 + # 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 \ + ${TOPDIR}/RPMS/${TARGET_ARCH} || \ + fatal 1 "Failed to copy MOFED rpms" + ;; + esac } @@ -1212,13 +1362,9 @@ store_for_reuse() { linkflag="l" fi - local default_iface=$(/sbin/ip route get 192.1.1.1 | sed -ne 's/.* dev \(.*\) * src .*/\1/p') - if [ -z "$default_iface" ]; then - fatal 1 "Failed to determine the default route interface" - fi - local unique_id=$(/sbin/ip addr show dev $default_iface | sed -ne '/ inet /s/ *inet \(.*\)\/.*/\1/p' | head -1) + local unique_id=$(hostname -s) if [ -z "$unique_id" ]; then - fatal 1 "Failed to determine a unique id from interface $default_interface" + fatal 1 "Failed to determine hostname." fi local finallocation="$location"/"$signature"/"$module" @@ -1336,8 +1482,6 @@ build_kernel_with_srpm() { do_patch_linux false >&${outfd} # sets global $FULL_PATCH (yeah, yuck) # get an md5sum of the kernel patch + config for reuse check - # XXX really, there needs to be a signature and a CONFIG_FILE per arch - # in BUILD_ARCHS local release_str if $RELEASE; then local release_str="RELEASE=$RELEASE\n" @@ -1426,16 +1570,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 @@ -1452,13 +1594,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 @@ -1495,7 +1648,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" @@ -1518,61 +1671,90 @@ 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() { - - if ! $PATCHLESS; then - local kernel_extra_version - if ! kernel_extra_version=$(build_kernel_with_srpm ${STDOUT}); then - fatal 1 "Failed to build the kernel from it's SRPM" - fi - - for arch in $BUILD_ARCHS; do - local kernel_devel_rpm - if ! kernel_devel_rpm=$(find_rpm "$TOPDIR/RPMS/$arch/" provides "^$(devel_kernel_name $KERNEL_LUSTRE_NAMING) ="); then - fatal 1 "Failed to find a kernel development RPM in $TOPDIR/RPMS/$arch/" - fi - - # install the -devel RPM in preparation for modules builds - if ! lnxrel="$kernel_extra_version" unpack_linux_devel_rpm \ - "$TOPDIR/RPMS/$arch/$kernel_devel_rpm"; then - fatal 1 "Could not find the Linux tree in $TOPDIR/RPMS/$arch/$kernel_devel_rpm" - fi - done - else - # need to find and unpack the vendor's own kernel-devel for patchless - # 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/$DISTROMAJ" - fi - if ! lnxrel="$lnxrel" unpack_linux_devel_rpm "$kernelrpm" "-"; then - fatal 1 "Could not find the Linux tree in $kernelrpm" - fi - fi + local ofed_type="$1" + local ofed_version="$2" + local kernelrpm + + if ! $PATCHLESS; then + if $PATCHLESS_SERVER; then + # need to find and unpack the vendor's own kernel-devel + # for patchless server build + if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE"); then + 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" + fi + # download and unpack kernel-debuginfo-common (only in EL) + if [[ $DISTROMAJ =~ rhel ]]; then + local KERNEL_DEBUGINFO="kernel-debuginfo-common-${TARGET_ARCH}-${lnxmaj}-${lnxrel}.${TARGET_ARCH}.rpm" + download_debuginfo_common "$KERNEL_DEBUGINFO" + if ! lnxrel="$lnxrel" unpack_linux_devel_rpm \ + "$KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$KERNEL_DEBUGINFO"; then + fatal 1 "Could not find the Linux debuginfo common rpm in $KERNELRPMSBASE/$lnxmaj/$DISTROMAJ/$TARGET_ARCH/$KERNEL_DEBUGINFO" + fi + fi + else + local kernel_extra_version + if ! kernel_extra_version=$(build_kernel_with_srpm ${STDOUT}); then + fatal 1 "Failed to build the kernel from it's SRPM" + fi + + local kernel_devel_rpm + if ! kernel_devel_rpm=$(find_rpm "$TOPDIR/RPMS/${TARGET_ARCH}/" provides "^$(devel_kernel_name $KERNEL_LUSTRE_NAMING) ="); then + fatal 1 "Failed to find a kernel development RPM in $TOPDIR/RPMS/${TARGET_ARCH}/" + fi + + # install the -devel RPM in preparation for modules builds + if ! lnxrel="$kernel_extra_version" unpack_linux_devel_rpm \ + "$TOPDIR/RPMS/${TARGET_ARCH}/$kernel_devel_rpm"; then + fatal 1 "Could not find the Linux tree in $TOPDIR/RPMS/${TARGET_ARCH}/$kernel_devel_rpm" + fi + fi + else + # need to find and unpack the vendor's own kernel-devel for patchless + # client build + if ! kernelrpm=$(find_linux_rpm "-$DEVEL_KERNEL_TYPE"); then + 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" + fi + fi # ~sigh~ have to make copies of and modify some of the rpm # infrastructure files so that find-requires can find our unpacked @@ -1607,7 +1789,7 @@ g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g wq EOF - build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" || + build_ofed "${LINUXOBJ:-$LINUX}" "$ofed_type" "$ofed_version" || fatal 1 "error building OFED" # now build Lustre @@ -1653,20 +1835,13 @@ EOF create_rpmbuild_dirs() { - [ -d RPMS ] || mkdir RPMS - for arch in $BUILD_ARCHS; do - if [[ $arch = i?86 ]]; then - # some stupidity in the sles11 kernel spec requires an RPMS/i386 - # even if the target arch is i686 - [ -d RPMS/i386 ] || mkdir RPMS/i386 - fi - [ -d RPMS/$arch ] || mkdir RPMS/$arch - done - [ -d RPMS/noarch ] || mkdir RPMS/noarch - [ -d BUILD ] || mkdir BUILD - [ -d SOURCES ] || mkdir SOURCES - [ -d SPECS ] || mkdir SPECS - [ -d SRPMS ] || mkdir SRPMS + [ -d RPMS ] || mkdir RPMS + [ -d RPMS/${TARGET_ARCH} ] || mkdir RPMS/${TARGET_ARCH} + [ -d RPMS/noarch ] || mkdir RPMS/noarch + [ -d BUILD ] || mkdir BUILD + [ -d SOURCES ] || mkdir SOURCES + [ -d SPECS ] || mkdir SPECS + [ -d SRPMS ] || mkdir SRPMS } @@ -1768,7 +1943,11 @@ set -E [ -r ~/.lbuildrc ] && . ~/.lbuildrc -options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ccache,norpm,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-version:,publish,disable-zfs,release,set-value:,src,stage:,target:,target-archs:,with-linux:,xen -- "$@") +options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,\ +patchless,patchless-server,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 -- "$@") if [ $? != 0 ]; then usage 1 @@ -1837,6 +2016,10 @@ while [ "$1" ]; do PATCHLESS=true shift ;; + --patchless-server) + PATCHLESS_SERVER=true + shift + ;; --kernelrpm) if ! KERNELRPMSBASE=$(canon_path "$2"); then fatal 1 "Could not determine the canonical location of $2" @@ -1865,6 +2048,14 @@ while [ "$1" ]; do OFED_VERSION="$2" shift 2 ;; + --ofed-type) + OFED_TYPE="$2" + shift 2 + ;; + --ofed-src) + OFED_SRC="$2" + shift 2 + ;; --publish) shift ;; @@ -1888,10 +2079,6 @@ while [ "$1" ]; do TARGET=$2 shift 2 ;; - --target-archs) - TARGET_ARCHS=$2 - shift 2 - ;; --xen) XEN=true shift @@ -1922,10 +2109,10 @@ unpack_lustre load_target -if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then - download_ofed - unpack_ofed || fatal 1 "Error unpacking OFED tarball" -fi + if [ -n "$OFED_TYPE" -a "$OFED_TYPE" != "inkernel" ]; then + download_ofed "$OFED_TYPE" "$OFED_VERSION" + unpack_ofed "$OFED_TYPE" "$OFED_VERSION" || fatal 1 "Error unpacking OFED tarball" + fi # make sure the RPM build environment is set up create_rpmbuild_dirs @@ -1936,7 +2123,7 @@ if [ -n "$LINUX" ]; then find_linux_release() { _find_linux_release $LINUX } - build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" || + build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_TYPE" "$OFED_VERSION" || fatal 1 "error building OFED" build_lustre "$LINUX" "$LINUXOBJ" else @@ -1944,7 +2131,7 @@ else fatal 1 "${LBUILD_DIR}/lbuild-$DISTROMAJ not found" fi source ${LBUILD_DIR}/lbuild-$DISTROMAJ - build_with_srpm || fatal 1 "Failed to build_with_srpm" + build_with_srpm "$OFED_TYPE" "$OFED_VERSION" || fatal 1 "Failed to build_with_srpm" fi stage