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=
# this is the dir that should be used to store reuse products
REUSEBUILD=
# should cached products be used or force rebuilding?
--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
DISTRO=${DISTRO/-/}
fi
+ [ -z "$TARGET" ] && TARGET=$(autodetect_target "$DISTRO")
+
if [ -z "$LINUX" ]; then
[ "$KERNELDIR" -o "$KERNELTREE" ] || \
usage 1 "A kernel directory must be specified with --kerneldir or --kerneltree."
[ -d "$KERNELDIR" -o -d "$KERNELTREE" ] || \
usage 1 "$KERNELDIR and $KERNELTREE are not a directory."
- [ "$TARGET" ] || TARGET=$(autodetect_target "$DISTRO")
# TARGET_FILE="$TOPDIR/lustre/kernel_patches/targets/$TARGET.target"
# [ -r "$TARGET_FILE" ] || \
# usage 1 "Target '$TARGET' was not found."
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
OFED_BASE_VERSION=${OFED_VERSION%.*}
fi
- local location="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/"
+ local location="https://www.openfabrics.org/downloads/OFED/ofed-${OFED_BASE_VERSION}/"
if [[ $OFED_VERSION = *-[rR][cC][0-9] ]]; then
local Mmv
local res2=""
local res3=""
for url in $urls; do
- # Try to match with MPSS 3.1 distro package
- if [[ $url =~ mpss-[0-9].[0-9]-$distro.tar ]]; then
- local bid=${url##*mpss-}
- bid="${bid%%-$distro.tar}.0-0"
- if [ -z "$build" ]; then
- res3="$bid"
- elif [ "$build" = "$bid" ]; then
- res3="$res3 $url"
- fi
- # Try to match with MPSS 3.1 source package
- elif [[ $url =~ mpss-src-[0-9].[0-9].tar ]]; then
- local bid=${url##*mpss-src-}
- bid="${bid%%.tar}.0-0"
- if [ -z "$build" ]; then
- res3="$bid"
- elif [ "$build" = "$bid" ]; then
- res3="$res3 $url"
+ 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
- # Try to match with MPSS 3.1 cross compiler package
- elif [[ $url =~ mpss-[0-9].[0-9]-k1om.tar ]]; then
- local bid=${url##*mpss-}
- bid="${bid%%-k1om.tar}.0-0"
if [ -z "$build" ]; then
- res3="$bid"
- elif [ "$build" = "$bid" ]; then
+ res3="$ver3"
+ elif [ "$build" = "$ver3" ]; then
res3="$res3 $url"
fi
- # Try to match with MPSS 2.1 source package
- elif [[ $url =~ _src-[0-9].[0-9].[0-9]*-[0-9]*_$distro_name.tar ]]; then
- local bid=${url##*_src-}
- bid=${bid%%_$distro_name.tar}
+ elif [ -n "$ver2" ]; then
if [ -z "$build" ]; then
- res2="$bid"
- elif [ "$build" = "$bid" ]; then
+ res2="$ver2"
+ elif [ "$build" = "$ver2" ]; then
res2="$res2 $url"
fi
fi
+
done
if [ -z "$build" ]; then
echo "$res2"
fi
elif [ "${build%%.*}" = "3" ]; then
- local ver=${build%.*}
- local bid=${build%%-*}
- bid=${bid##$ver.}
+ 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/builds/mpss/rc"}/$bid/release/knightscorner/package/mpss-src-$ver.tar"
+ 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/builds/mpss/rc"}/$bid/release/knightscorner/package/mpss-$ver-k1om.tar"
+ 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/builds/mpss/rc"}/$bid/release/knightscorner/package/mpss-$ver-$distro.tar"
+ 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
[ -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-0 ]] && force=true
+ [[ $MPSS_VERSION = [0-9].[0-9].[0-9]*-0 ]] && force=true
local url
local i=0
[ -d mpss ] && return 0
if [ "${MPSS_VERSION%%.*}" = "3" ]; then
- local ver=${MPSS_VERSION%.*}
+ 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
pushd lustre >/dev/null
+ if ! build_lustre_dkms; then
+ popd >/dev/null # pushd lustre
+ return 255
+ fi
+
echo "Building Lustre RPMs for: $BUILD_ARCHS..."
local targets arch
for arch in $BUILD_ARCHS; do
}
+build_lustre_dkms() {
+ [ -n "$MPSS_VERSION" ] && return 0
+ local ver=$(eval echo $(awk '/LUSTRE_VERSION_STRING/ {print $3}' lustre/include/lustre_ver.h))
+ 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
+ return 0
+}
+
###
# 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.2}
- SPLZFSTAG=${SPLZFSTAG:-upstream-master}
+ SPLZFSVER=${SPLZFSVER:-0.6.3}
+ SPLZFSTAG=${SPLZFSTAG:-}
# The files expect a kver to be set to the kernel version .
local kver=$(find_linux_release)
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
-
- # This differentiates between older zfs versions
- if [ -f $pkg-modules.spec.in ]; then
- rpmpkg=$pkg-modules
- specdir=.
- speclist="$pkg.spec $rpmpkg.spec"
- else
+ if [ -n "$SPLZFSTAG" ]; then
+ git checkout $SPLZFSTAG
+ else
+ git checkout -b lbuild $pkg-$SPLZFSVER
+ fi
+
+ # This differentiates between older zfs versions
+ if [ -f $pkg-modules.spec.in ]; then
+ rpmpkg=$pkg-modules
+ specdir=.
+ speclist="$pkg.spec $rpmpkg.spec"
+ else
rpmpkg=kmod-$pkg-devel
- specdir=rpm/generic
- speclist="$pkg.spec $pkg-kmod.spec $pkg-dkms.spec"
- fi
+ 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=${LINUXOBJ:-$LINUX} \
${spldir:+--with-spl="${spldir}"} 2>&1 ||
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
-
- 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 [ -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
+
+ # 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 $TOPDIR/reused" \
- --define "_topdir $TOPDIR" 2>&1; then
- return 255
+ --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 $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
# 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
- mkdir -p $TOPDIR/zfsdevel
- pushd $TOPDIR/zfsdevel
- # We also need to extract zfs-devel rpm
- local devel_rpm=$(ls -1 $TOPDIR/RPMS/*/$pkg-devel-*.rpm)
- rpm2cpio $devel_rpm | cpio -id
- popd
- CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR/zfsdevel ${CONFIGURE_FLAGS}"
+ # 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
[ -r ~/.lbuildrc ] && . ~/.lbuildrc
-options=$(getopt -o D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ldiskfs,ccache,reuse:,norpm,disable-datestamp,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,noiokit,ofed-version:,mpss-version:,publish,release,set-value:,src,stage:,tag:,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:,mpss-version:,publish,release,set-value:,src,stage:,target:,target-archs:,with-linux:,xen -- "$@")
if [ $? != 0 ]; then
usage 1
DISTRO=$2
shift 2
;;
- --reuserpm)
- REUSERPM=$2
- shift 2
- ;;
--reusebuild)
if ! REUSEBUILD=$(canon_path "$2"); then
fatal 1 "Could not determine the canonical location of $2"
NORPM=true
shift
;;
- --ldiskfs)
- echo "WARNING: \"--ldiskfs\" is deprecated" > 2
- shift
- ;;
--noiokit)
IOKITRPM=false
shift
STAGEDIR=$2
shift 2
;;
- --tag)
- shift 2
- echo "WARNING: \"--tag\" is deprecated" > 2
- ;;
--target)
TARGET=$2
shift 2
LUSTRE_TESTS=false
fi
CONFIGURE_FLAGS=$@
- CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-liblustre --enable-liblustre-tests"
break
;;
*)
if [ "${MPSS_VERSION%%.*}" = "3" ]; then
CC_TARGET_ARCH=k1om-mpss-linux
LINUX="$TOPDIR/mpss"
- RPMBUILD_DEFS="$RPMBUILD_DEFS --define \"cross_requires mpss-bootimage\""
else
CC_TARGET_ARCH=x86_64-k1om-linux
LINUX="$TOPDIR/mpss/card/kernel"
# if an unpacked kernel source tree was given on the command line
# just build lustre with it (nothing distro kernel specific here)
if [ -n "$LINUX" ]; then
+ find_linux_release() {
+ _find_linux_release $LINUX
+ }
build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" ||
fatal 1 "error building OFED"
build_lustre "$LINUX" "$LINUXOBJ"
git://git.whamcloud.com / fs / lustre-release.git / blobdiff