X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=contrib%2Flbuild%2Flbuild;h=725cdf193993cdc5b023e77fb78e10c6131f09a9;hb=a7d8aa2c3bac1ac0662b40ff018cc588e946cee4;hp=71e6d8240b3b2e7e3be339e4f8dc234674f6d896;hpb=babd429f5b35e608113403611de26af2f3a18537;p=fs%2Flustre-release.git diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 71e6d82..725cdf1 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= @@ -65,12 +65,12 @@ 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 OSDLDISKFSRPM=true OSDZFSRPM=false SMPTYPES="smp bigsmp default ''" PATCHLESS=false +WITH_ZFS="" XEN=false LINUXOBJ= DISTRO= @@ -103,8 +103,6 @@ LUSTRE_TESTS=true DATE=$(date) -RPMBUILD= - export CC=${CC:-gcc} # Readlink is not present on some older distributions: emulate it. @@ -144,7 +142,7 @@ Usage: ${0##*/} [OPTION]... [-- ] Use ccache --norpm - Do not build RPMs (compile only mode) + Unused. --patchless Build lustre client only @@ -168,7 +166,7 @@ Usage: ${0##*/} [OPTION]... [-- ] 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 @@ -187,6 +185,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. @@ -261,11 +262,10 @@ check_options() { if [ -z "$DISTRO" ] ; then DISTRO=$(autodetect_distro) - # remove minor version only for rhel and oel - [[ $DISTRO =~ "el-" ]] && DISTRO=${DISTRO%%.*} # remove separator DISTRO=${DISTRO/-/} fi + DISTROMAJ=${DISTRO%%.*} [ -z "$TARGET" ] && TARGET=$(autodetect_target "$DISTRO") @@ -282,7 +282,13 @@ check_options() { fi case $TARGET in - 2.6-rhel6) + 3.12-sles12) + CANONICAL_TARGET="sles12" + ;; + 3.10-rhel7) + CANONICAL_TARGET="rhel7" + ;; + 2.6-rhel6*) CANONICAL_TARGET="rhel6" ;; 2.6-rhel5) @@ -325,31 +331,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 + local 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 @@ -362,7 +384,6 @@ check_options() { fi return 0 - } # compare two versions $1 and $2. if $1 < $2, return 0 otherwise return 1. @@ -384,6 +405,8 @@ compare_version () { return 1 fi done + + return 0 } uniqify() { @@ -429,7 +452,7 @@ download_srpm() { if $force || [ ! -r "$KERNELDIR/$srpm" ] || [ ! -s "$KERNELDIR/$srpm" ]; then if $DOWNLOAD; then - local location="http://downloads.lustre.org/public/kernels/$target/old" + 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) @@ -439,11 +462,11 @@ download_srpm() { [ ! -s "$KERNELDIR/$srpm" ]; then rm -f $KERNELDIR/$srpm # punt to a distro specific method if it exists - if ! type -p download_srpm-$DISTRO; then + if ! type -p download_srpm-$DISTROMAJ; 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." + 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 @@ -550,17 +573,16 @@ download_ofed() { if [[ $OFED_VERSION = *-[rR][cC][0-9] ]]; then local Mmv Mmv=${OFED_VERSION%%-[rR][cC][0-9]} - location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/" + location="https://www.openfabrics.org/downloads/OFED/ofed-${Mmv}/" fi if [[ $OFED_VERSION = daily-* ]]; then - local Mmv daily - OFED_VERSION=${OFED_VERSION/daily-/} - Mmv=${OFED_VERSION%%-*} + local Mmv + Mmv=${OFED_VERSION/daily-/} daily=${OFED_VERSION##$Mmv-} - location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}-daily/" + 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 "/${daily}-/s/.*href=\"OFED-(${Mmv//./\\.}-${daily}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1) + 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 @@ -571,129 +593,6 @@ download_ofed() { } -parse_mpss_info() { - local file="$1" - local build="$2" - local distro="$3" - - [ -r "$file" ] || fatal 1 "Could not find MPSS info file" - - # convert to MPSS distro naming - distro=${distro/sles/suse} - distro_name=${distro%%-*} - - # extract links from MPSS info file - local urls=$(cat "$file" | \ - tr -d '\t\r\n' | sed -e 's?\(\)?\1\n?g' | \ - grep '.intel.com/' | \ - sed -e 's/^.*[hH][rR][eE][fF]="\([^>"]\+\)".*$/\1/g' | \ - grep '.tar') - local res2="" - local res3="" - for url in $urls; do - local ver2="" - local ver3="" - # Try to match with MPSS 3.x or 3.x.x distro package - if [[ $url =~ mpss-[0-9].[0-9](.[0-9]*)?-$distro.tar ]]; then - ver3=${url##*mpss-} - ver3=${ver3%%-$distro.tar} - # Try to match with MPSS 3.x or 3.x.x source package - elif [[ $url =~ mpss-src-[0-9].[0-9](.[0-9]*)?.tar ]]; then - ver3=${url##*mpss-src-} - ver3=${ver3%%.tar} - # Try to match with MPSS 3.x or 3.x.x cross compiler package - elif [[ $url =~ mpss-[0-9].[0-9](.[0-9]*)?-k1om.tar ]]; then - ver3=${url##*mpss-} - ver3=${ver3%%-k1om.tar} - # Try to match with MPSS 2.1.x source package - elif [[ $url =~ _src-[0-9].[0-9].[0-9]*-[0-9]*_$distro_name.tar ]]; then - ver2=${url##*_src-} - ver2=${ver2%%_$distro_name.tar} - fi - - if [ -n "$ver3" ]; then - # Check for MPSS 3.x or MPSS 3.x.x - if [[ $ver3 =~ [0-9].[0-9].[0-9]* ]]; then - ver3="${ver3}-0" - else - ver3="${ver3}.0-0" - fi - if [ -z "$build" ]; then - res3="$ver3" - elif [ "$build" = "$ver3" ]; then - res3="$res3 $url" - fi - elif [ -n "$ver2" ]; then - if [ -z "$build" ]; then - res2="$ver2" - elif [ "$build" = "$ver2" ]; then - res2="$res2 $url" - fi - fi - - done - - if [ -z "$build" ]; then - # return a last version of MPSS - if [ -n "$res3" ]; then - echo "$res3" - else - echo "$res2" - fi - elif [ "${build%%.*}" = "3" ]; then - local ver=${build%%-*} - local bid=${build##*-} - if [ $bid -eq 0 ]; then - # return URLs from MPSS info file - echo "$res3" - else - # Check for MPSS 3.x or MPSS 3.x.x - if [ ${ver##*.} -eq 0 ]; then - ver=${ver%.*} - fi - # return URLs from internal site with MPSS builds - # kernel sources: - echo "${MPSS_BUILDS:-"http://mic-bld.pdx.intel.com/release"}/$ver/$bid/release/knightscorner/package/mpss-src-$ver.tar" - # kernel configs: - echo "${MPSS_BUILDS:-"http://mic-bld.pdx.intel.com/release"}/$ver/$bid/release/knightscorner/package/mpss-$ver-k1om.tar" - # OFED headers: - echo "${MPSS_BUILDS:-"http://mic-bld.pdx.intel.com/release"}/$ver/$bid/release/knightscorner/package/mpss-$ver-$distro.tar" - fi - else - # return URLs from MPSS info file - echo "$res2" - fi -} - -# Get public information about last releases of -# Intel Manycore Platform Software Stack (MPSS) -download_mpss_info() { - local file="$1" - local force="${2:-true}" - local url=${MPSS_URL:-"http://software.intel.com/en-us/articles/intel-manycore-platform-software-stack-mpss"} - - download_file "$url" "$file" "$force" -} - -download_mpss() { - local file="$1" - local force="${2:-false}" - local urls=$(parse_mpss_info "$file" ${MPSS_VERSION} ${MPSS_DISTRO}) - - [ -z "$urls" ] && fatal 1 "Could not determine the URLs of MPSS $MPSS_VERSION" - - # force re-download if build number is zero - [[ $MPSS_VERSION = [0-9].[0-9].[0-9]*-0 ]] && force=true - - local url - local i=0 - for url in $urls; do - file="$KERNELTREE/mpss_src-${MPSS_VERSION}-${MPSS_DISTRO}-part$i.tar" - download_file "$url" "$file" "$force" - i=$((i+1)) - done -} - load_target() { EXTRA_VERSION_save="$EXTRA_VERSION" @@ -725,7 +624,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 @@ -774,9 +673,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/") - if ! $PATCHLESS && [ -n "$BUILDID" ]; then - EXTRA_VERSION="${EXTRA_VERSION}.${BUILDID}" - fi fi fi # EXTRA_VERSION=${EXTRA_VERSION//-/_} @@ -797,18 +693,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" @@ -843,73 +740,6 @@ unpack_lustre() { } -unpack_mpss() { - - [ -d mpss ] && return 0 - - if [ "${MPSS_VERSION%%.*}" = "3" ]; then - local ver=${MPSS_VERSION%%-*} - local file - local i - # Check for MPSS 3.x or MPSS 3.x.x - if [ ${ver##*.} -eq 0 ]; then - ver=${ver%.*} - fi - for i in $(seq 0 9); do - file="$KERNELTREE/mpss_src-${MPSS_VERSION}-${MPSS_DISTRO}-part$i.tar" - if [ -r "$file" ]; then - untar "$file" \ - "mpss-$ver/*/linux-*.tar.bz2" \ - "mpss-$ver/*/kernel-dev-*.rpm" \ - "mpss-$ver/*/ofed-driver-*-devel-*.rpm" - fi - done - # Extract kernel configs - file=$(find mpss-$ver -type f -path "*/kernel-dev-*.rpm") - if ! rpm2cpio "$file" | cpio -idm; then - echo "Error extracting MPSS kernel configs" - return 1 - fi - # Unpack kernel sources - file=$(find mpss-$ver -type f -path "*/linux-*.tar.bz2") - if ! untar "$file"; then - echo "Error unpacking MPSS kernel sources" - return 1 - fi - # Extract OFED headers - file=$(find mpss-$ver -type f -path "*/ofed-driver-*-devel-*.rpm") - if ! rpm2cpio "$file" | cpio -idm; then - echo "Error extracting MPSS OFED headers" - return 1 - fi - # Remove unpacked archives to save space - rm -rf mpss-$ver - # Make link to MPSS kernel sources - ln -sf linux-* mpss - else - local dir="mpss-${MPSS_VERSION}-${MPSS_DISTRO%%-*}" - - mkdir $dir || return 255 - pushd $dir >/dev/null || return 255 - if ! untar "$KERNELTREE/mpss_src-${MPSS_VERSION}-${MPSS_DISTRO}-part0.tar" "*/gpl/*full_src*"; then - popd >/dev/null - rm -rf $dir - echo "Error unpacking MPSS tarball 1" - return 1 - fi - local file=$(find . -type f -path "*/gpl/*full_src*") - if ! untar "$file"; then - popd >/dev/null - rm -rf $dir - echo "Error unpacking MPSS tarball 2" - return 1 - fi - popd >/dev/null - ln -sf $dir mpss - fi - -} - do_patch_linux() { local do_patch=${1:-true} @@ -950,6 +780,7 @@ do_patch_linux() { build_lustre() { local linux="$1" local linuxobj="$2" + local configure_args="" cp "$LUSTRE" SOURCES @@ -961,28 +792,12 @@ build_lustre() { fi 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" - fi - - local rpmbuildopt='-tb' - if $NORPM; then - rpmbuildopt='-tc' - echo NORPM mode. Only compiling. - fi # 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 @@ -990,59 +805,68 @@ build_lustre() { fi if $PATCHLESS; then - RPMBUILD_DEFS="$RPMBUILD_DEFS --without servers" - if [ -n "$CROSS_SUFFIX" ]; then - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"lustre_name lustre-client$CROSS_SUFFIX\"" - fi + configure_args="$configure_args --disable-server" fi # ditto for the lustre-tests boolean if ! $LUSTRE_TESTS; then - RPMBUILD_DEFS="$RPMBUILD_DEFS --without lustre_tests" + configure_args="$configure_args --disable-tests" fi if ! $IOKITRPM; then - RPMBUILD_DEFS="$RPMBUILD_DEFS --without lustre_iokit" + 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_DEFS="$RPMBUILD_DEFS ${FIND_REQUIRES:+--define \"__find_requires $FIND_REQUIRES\"}" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"configure_args $confoptions ${CONFIGURE_FLAGS}\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"kdir $linux\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS ${linuxobj:+--define \"kobjdir $linuxobj\"}" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_tmppath $TMPDIR\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_topdir $TOPDIR\"" + 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 - eval $RPMBUILD $targets $rpmbuildopt "$LUSTRE" $RPMBUILD_DEFS \ - ${osd_zfs:+--with zfs} \ - ${osd_ldiskfs:+--with ldiskfs} 2>&1 || \ + ./configure $configure_args $CONFIGURE_FLAGS 2>&1 || + fatal 1 "Error in configure." + make rpms 2>&1 || fatal 1 "Error building rpms for $BUILD_ARCHS." - if $DO_SRC; then - if ! eval $RPMBUILD -ts "$LUSTRE" $RPMBUILD_DEFS 2>&1; then - popd >/dev/null - 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 + 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 - $RPMBUILD --define="_topdir $TOPDIR" -bs lustre-dkms.spec || return 255 - $RPMBUILD --rebuild --define="_topdir $TOPDIR" $TOPDIR/SRPMS/lustre-dkms-$ver-*.src.rpm || return 255 + ./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 } @@ -1066,7 +890,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.3} + SPLZFSVER=${SPLZFSVER:-0.6.5.7} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . @@ -1078,7 +902,7 @@ 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 @@ -1131,7 +955,7 @@ 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 "require_kdir ${LINUX}" \ ${LINUXOBJ:+--define "require_kobj ${LINUXOBJ}"} \ @@ -1173,7 +997,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 @@ -1182,34 +1006,6 @@ build_spl_zfs() { return 0 } -prepare_mpss() { - - pushd mpss >/dev/null || return 255 - if [ "${MPSS_VERSION%%.*}" = "3" ]; then - cp -f ../boot/config-* .config - if ! make ARCH=k1om silentoldconfig ; then - popd >/dev/null - return 1 - fi - if ! make ARCH=k1om modules_prepare ; then - popd >/dev/null - return 1 - fi - cp -f ../boot/Module.symvers-* Module.symvers - else - if ! make defconfig-miclinux; then - popd >/dev/null - return 1 - fi - if ! make -C card/kernel ARCH=k1om modules_prepare ; then - popd >/dev/null - return 1 - fi - fi - popd >/dev/null - -} - stage() { [ "$STAGEDIR" ] || return 0 @@ -1218,10 +1014,9 @@ 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" @@ -1294,8 +1089,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 @@ -1320,13 +1115,13 @@ build_kernel_ib() { 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" + local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod --with-mlx4_en-mod --with-cxgb3-mod --with-nes-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" + 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 @@ -1397,8 +1192,7 @@ EOF 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"} \ + 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}" \ @@ -1557,8 +1351,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 $LBUILD_DIR/lbuild $LBUILD_DIR/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 @@ -1652,9 +1450,9 @@ 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 @@ -1675,8 +1473,8 @@ build_ofed() { echo "$(find_linux_release; echo "$BUILD_GEN")"; cat "${linux}/include/linux/autoconf.h"; - cat "$LBUILD_DIR/lbuild" ; - cat "$LBUILD_DIR/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 @@ -1776,7 +1574,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" @@ -1787,7 +1585,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//\//\\/}" @@ -1976,7 +1774,7 @@ 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:,mpss-version:,publish,release,set-value:,src,stage:,target:,target-archs:,with-linux:,xen -- "$@") +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 -- "$@") if [ $? != 0 ]; then usage 1 @@ -2035,7 +1833,6 @@ while [ "$1" ]; do shift 2 ;; --norpm) - NORPM=true shift ;; --noiokit) @@ -2074,13 +1871,13 @@ while [ "$1" ]; do OFED_VERSION="$2" shift 2 ;; - --mpss-version) - MPSS_VERSION="$2" - shift 2 - ;; --publish) shift ;; + --disable-zfs) + WITH_ZFS="no" + shift + ;; --release) RELEASE=true shift @@ -2129,11 +1926,6 @@ check_options unpack_lustre -# XXX - should we _always_ get the buildid from the META file? what are the -# other (i.e. non-lustre-tarball use cases of lbuild)? -BUILDID=$(sed -ne '/^BUILDID =/s/.*= *//p' lustre/META) -VERSION=$(sed -ne '/^VERSION =/s/.*= *//p' lustre/META) - load_target if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then @@ -2141,64 +1933,6 @@ if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then unpack_ofed || fatal 1 "Error unpacking OFED tarball" fi -if [ -n "$MPSS_VERSION" ]; then - [ -z "$MPSS_DISTRO" ] && MPSS_DISTRO=$(autodetect_distro) - - MPSS_INFO=$(mktemp -u mpss-info-XXXXXXXXXX.html) - download_mpss_info "$MPSS_INFO" - - if [ "$MPSS_VERSION" = "last" ]; then - MPSS_VERSION=$(parse_mpss_info "$MPSS_INFO" "" ${MPSS_DISTRO}) - [ -z "$MPSS_VERSION" ] && fatal 1 "Could not determine the last MPSS version" - elif [[ $MPSS_VERSION != [0-9].[0-9].[0-9]*-[0-9]* ]]; then - fatal 1 "Incorrect MPSS version $MPSS_VERSION" - fi - - download_mpss "$MPSS_INFO" - [ -r "$MPSS_INFO" ] && rm -f "$MPSS_INFO" - echo "Building with MPSS $MPSS_VERSION" - unpack_mpss || fatal 1 "Error unpacking MPSS tarballs" - prepare_mpss || fatal 1 "Error preparing MPSS for kernel modules build" - - if [ -z "$MPSS_OFED" ]; then - MPSS_OFED=$(find $PWD -type f -path "*/ofed-driver-*/Module.symvers") - if [ -n "$MPSS_OFED" ]; then - MPSS_OFED="--with-o2ib=$(dirname $MPSS_OFED)" - else - MPSS_OFED="--without-o2ib" - fi - fi - - # disable unsupported parts: - PATCHLESS=true - IOKITRPM=false - LDISKFSRPM=false - ZFSNOTSUPPORTED="yes" - - # define variables for cross compilation: - CROSS_SUFFIX="-mic" - if [ "${MPSS_VERSION%%.*}" = "3" ]; then - CC_TARGET_ARCH=k1om-mpss-linux - LINUX="$TOPDIR/mpss" - else - CC_TARGET_ARCH=x86_64-k1om-linux - LINUX="$TOPDIR/mpss/card/kernel" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_requires intel-mic-gpl = ${MPSS_VERSION%%-*}\"" - fi - CONFIGURE_FLAGS="$CONFIGURE_FLAGS $MPSS_OFED --host=$CC_TARGET_ARCH --build=x86_64-pc-linux" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"post_script build/gen_filelist.sh\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"make_args ARCH=k1om CROSS_COMPILE=${CC_TARGET_ARCH}-\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_path ${CROSS_PATH:=/opt/lustre/${VERSION}/${CC_TARGET_ARCH}}\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"rootdir %{cross_path}\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_prefix %{cross_path}/usr\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_mandir %{_prefix}/share/man\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"_sysconfdir %{cross_path}/etc\"" - RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"kmoddir extra\"" - - # redefine CC for proper ./configure during rpmbuild - export CC=${CC_TARGET_ARCH}-gcc -fi - # make sure the RPM build environment is set up create_rpmbuild_dirs @@ -2212,10 +1946,10 @@ if [ -n "$LINUX" ]; then fatal 1 "error building OFED" build_lustre "$LINUX" "$LINUXOBJ" else - if [ ! -f "${LBUILD_DIR}/lbuild-$DISTRO" ]; then - fatal 1 "${LBUILD_DIR}/lbuild-$DISTRO not found" + if [ ! -f "${LBUILD_DIR}/lbuild-$DISTROMAJ" ]; then + fatal 1 "${LBUILD_DIR}/lbuild-$DISTROMAJ not found" fi - source ${LBUILD_DIR}/lbuild-$DISTRO + source ${LBUILD_DIR}/lbuild-$DISTROMAJ build_with_srpm || fatal 1 "Failed to build_with_srpm" fi