# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+# this is an alternative FD for stdout, to be used especially when we are
+# taking stdout from a function as it's return value. i.e. foo=$(bar)
+# this is a workaround until a version of bash where we can put xtrace
+# on a specific FD
+exec 3>&1; STDOUT=3
+
#set -x
+xtrace="+x"
+if [[ $SHELLOPTS = *xtrace* ]]; then
+ xtrace="-x"
+fi
shopt -s extdebug
+# include the exit_traps library
+. ${0%/lbuild}/exit_traps.sh
+
+# our children should die when we do
+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
+
TOPDIR=$PWD
# CVSROOT is inherited from the environment
# search through this file (and lbuild.old_school -- but that will
# be going away soon) for "-bb" and see how many places
# simply don't account for this option
-DO_SRC=false
+DO_SRC=true
DOWNLOAD=true
TAG=
CANONICAL_TARGET=
CONFIGURE_FLAGS=
EXTERNAL_PATCHES=
EXTRA_VERSION=
-LUSTRE_EXTRA_VERSION=
STAGEDIR=
TMPDIR=${TMPDIR:-"/var/tmp"}
TIMESTAMP=
-# XXX - i think these two parameters/arguments/variables need to be
-# cleaned up and merged. they effectively do the same thing
+# 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?
+USE_BUILD_CACHE=true
# what does this do exactly? does it imply no kernel build?
NORPM=false
LDISKFSRPM=true
SKIPLDISKFSRPM="v1_4_* b1_4"
SMPTYPES="smp bigsmp default ''"
-KERNCONFSMPTYPE=
PATCHLESS=false
XEN=false
LINUXOBJ=
DISTRO=
KERNELTREE=
+# default to not adding -lustre- into the kernel RPM package names
+KERNEL_LUSTRE_NAMING=false
# patchless build
KERNELRPMSBASE=
# not in the target file any more
CONFIG=
+# build the lustre-tests rpm?
+LUSTRE_TESTS=true
+
DATE=$(date)
USE_DATESTAMP=1
error() {
local msg="$1"
- [ -n "$msg" ] && echo -e "\n${0##*/}: $msg" >&2
+ [ -n "$msg" ] && echo -e "\n${0##*/}: $msg" >&3
}
--xen
Builds a Xen domX kernel.
+ --set-value
+ Set's a variable to a given value.
+
EOF
# list_targets
fatal "$1" "$2"
}
-# canonicalize a relative path
+# canonicalize a relative path to a file
+canon_filepath() {
+ local PATH="$1"
+
+ if [ ! -f "$PATH" ]; then
+ return 1
+ fi
+
+ local FILE=${PATH##*/}
+ local DIR=${PATH%/*}
+
+ echo $(canon_path "$DIR")/$FILE
+ return 0
+}
+
+# canonicalize a relative path to a dir
canon_path() {
local PATH="$1"
2.6-sles10)
CANONICAL_TARGET="sles10-2.6"
;;
+ 2.6-sles11)
+ CANONICAL_TARGET="sles11"
+ ;;
+ 2.6-oel5)
+ CANONICAL_TARGET="oel5"
+ ;;
hp_pnnl-2.4)
CANONICAL_TARGET="hp-pnnl-2.4"
;;
fi
if [ -n "$CCACHE" ]; then
- which "$DISTCC" 2>/dev/null && export DISTCC RPM_BUILD_NCPUS
+ which "$DISTCC" &>/dev/null && export DISTCC RPM_BUILD_NCPUS
- if which "$CCACHE" 2>/dev/null; then
+ if which "$CCACHE" &>/dev/null; then
local ccache=$(which "$CCACHE")
local bindir="$TOPDIR/bin"
- [ -d $bindir ] || mkdir -p $bindir
- if [ -d $bindir ]; then
- rm ${bindir}/* > /dev/null 2>&1
- ln -s "$ccache" ${bindir}/ccache
- ln -s "$ccache" ${bindir}/cc
- ln -s "$ccache" ${bindir}/$CC
- export PATH=$bindir:$PATH
+ 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"
# zero the cache so we can see how effective we are being with it
+ echo -n "ccache "
ccache -z
+
+ # get some ccache stats when we are done
+ push_exit_trap '[ -n "$CCACHE" ] && ccache -s' "ccache_summary"
+ # should remove the ccache trap if lbuild is interrupted
+ trap 'echo "Received an INT TERM or HUP signal, terminating."; delete_exit_trap "ccache_summary"; exit 1' INT TERM HUP
fi
fi
[ -z "$DISTRO" ] && DISTRO=$(autodetect_distro)
+
+ return 0
+
}
# autodetect used Distro
sed -e 's/^[^0-9.]*//g' | sed -e 's/[ \.].*//')
fi
if [ -z "$name" -o -z "$version" ]; then
- fatal 1 "I don't know how to determine distro type/version.\n" \
- "Either update autodetect_distro() or use the --distro argument"
+ fatal 1 "I don't know how to determine distro type/version.\nEither update autodetect_distro() or use the --distro argument"
fi
echo ${name}${version}
download_srpm() {
local target=$1
local srpm=$2
+ local force="${3:-false}"
- # ~sigh~ the download site doesn't actually have these kernels
- echo "Downloading http://downloads.lustre.org/public/kernels/$target/old/$srpm..."
- if ! wget -nv "http://downloads.lustre.org/public/kernels/$target/old/$srpm" \
- -O "$KERNELDIR/$srpm"; then
- fatal 1 "Could not download target $target's kernel SRPM $srpm from downloads.lustre.org."
+ if $force || [ ! -r "$KERNELDIR/$srpm" ] ||
+ [ ! -s "$KERNELDIR/$srpm" ]; then
+ if $DOWNLOAD; then
+ local location="http://downloads.lustre.org/public/kernels/$target/old"
+ echo "Downloading $location/$srpm..."
+ if ! wget -nv "$location/$srpm" -O "$KERNELDIR/$srpm" 2>&1 ||
+ [ ! -s "$KERNELDIR/$srpm" ]; then
+ rm -f $KERNELDIR/$srpm
+ fatal 1 "Could not download target $target's kernel SRPM $srpm from $location."
+ fi
+ else
+ fatal 1 "$srpm not found in directory $KERNELDIR."
+ fi
fi
- [ -s "$KERNELDIR/$srpm" ] || {
- rm -rf $KERNELDIR/$srpm
- fatal 1 "Could not download target $target's kernel SRPM $srpm from downloads.lustre.org."
- }
}
-download_ofed() {
+download_file() {
+ local from="$1"
+ local to="$2"
+ local force="$3"
+
+ local file=${from##*/}
+
+ if [ -d $to ]; then
+ to="$to/$file"
+ fi
+
+ local semaphore="$to-downloading"
+
+ is_downloading() {
+ if [ ! -f $semaphore ]; then
+ return 1
+ fi
+
+ # make sure the download has not been aborted
+ local now=$(date +%s)
+ local file_mtime=$(stat -c %Y "$to")
+ local staleness=$((now - file_mtime))
+ # let's assume an active download will write at least once a minute
+ if [ $staleness -gt 60 ]; then
+ return 1
+ fi
+
+ return 0
+ }
+
+ is_downloaded() {
+ # if the semaphore file exists, the file is either still downloading
+ # or a download was aborted and we cannot trust the target file
+ if [ -f $semaphore ]; then
+ return 1
+ fi
+
+ if ! is_downloading && [ -r "$to" ] && [ -s "$to" ]; then
+ return 0
+ fi
+
+ return 1
+ }
+
+ if $force || ! is_downloaded; then
+ if is_downloading; then
+ echo "Somebody else is downloading $from..."
+ while is_downloading; do
+ echo "Waiting for $to to finish downloading"
+ sleep 60
+ done
+ if is_downloaded; then
+ return 0
+ else
+ echo "The download we were waiting for seems to have been aborted"
+ fi
+
+ fi
- if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ] && \
- [ ! -r "$KERNELTREE/OFED-${OFED_VERSION}.tgz" ]; then
if $DOWNLOAD; then
- local location="http://downloads.lustre.org/public/OFED/"
- echo "Downloading $location/OFED-${OFED_VERSION}.tgz..."
- if ! wget -nv "$location/OFED-${OFED_VERSION}.tgz" \
- -O "$KERNELTREE/OFED-${OFED_VERSION}.tgz"; then
- fatal 1 "Could not download OFED-${OFED_VERSION}.tgz" \
- "from downloads.lustre.org."
+ echo "Downloading $from..."
+ # flag others so they don't try to download also
+ push_exit_trap "rm -f $to $semaphore" "download"
+ touch $semaphore
+ if ! wget -nv "$from" -O "$to" || [ ! -s "$to" ]; then
+ # the trap will remove the files via the fatal below
+ fatal 1 "Could not download ${to##*/} from ${from%/*}/."
fi
+ rm -f $semaphore
+ delete_exit_trap "download"
else
- fatal 1 "OFED-${OFED_VERSION}.tgz not found in kernel" \
- "directory $KERNELTREE."
+ fatal 1 "${to##*/} not found in directory ${to%/*}."
+ fi
+ fi
+
+ return 0
+
+}
+
+download_ofed() {
+ local force="${1:-false}"
+
+ if [ -z "$OFED_VERSION" -o "$OFED_VERSION" = "inkernel" ]; then
+ return 0
+ fi
+
+ local location="http://www.openfabrics.org/downloads/OFED/ofed-${OFED_VERSION}/"
+
+ if [[ $OFED_VERSION = daily-* ]]; then
+ local Mmv daily
+ OFED_VERSION=${OFED_VERSION/daily-/}
+ Mmv=${OFED_VERSION%%-*}
+ daily=${OFED_VERSION##$Mmv-}
+ location="http://www.openfabrics.org/downloads/OFED/ofed-${Mmv}-daily/"
+ # find the filename for the version for the date specified
+ OFED_VERSION=$(curl -s "$location" | sed -nre "/${daily}-/s/.*href=\"OFED-(${Mmv//./\\.}-${daily}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1)
+ if [ -z "$OFED_VERSION" ]; then
+ fatal 1 "Could not determine the filename of the OFED snapshot for ${daily}"
fi
fi
+ local file="OFED-${OFED_VERSION}.tgz"
+ download_file "$location/$file" "$KERNELTREE" "$force"
+
}
load_target() {
echo "Loading target config file $TARGET.target..."
+ # if the caller specified an OFED_VERSION it should override whatever
+ # the target file specifies
+ local env_OFED_VERSION="$OFED_VERSION"
+
. "$TARGET_FILE"
+ if [ -n "$env_OFED_VERSION" ]; then
+ OFED_VERSION="$env_OFED_VERSION"
+ fi
+
# doesn't make any sense to build OFED for xen domX's
if $XEN; then
OFED_VERSION=""
[ -z "$RPMSMPTYPE" ] && set_rpm_smp_type
# CC might have been overwriten in TARGET_FILE
- if [[ $CC != ccache\ * ]] && which "$CCACHE" 2>/dev/null; then
+ if [[ $CC != ccache\ * ]] && which "$CCACHE" &>/dev/null; then
export CCACHE && export CC="ccache $CC"
fi
for patchesdir in "$EXTERNAL_PATCHES" "$TOPDIR/lustre/lustre/kernel_patches"; do
[ -r "$patchesdir/series/$series" ] && continue 2
done
- fatal 1 "Target $TARGET's series $SERIES could not be" \
- "found.\nSearched:\n\t$EXTERNAL_PATCHES/series\n" \
- "\t$TOPDIR/lustre/lustre/kernel_patches/series."
+ fatal 1 "Target $TARGET's series $SERIES could not be found.\nSearched:\n\t$EXTERNAL_PATCHES/series\n\t$TOPDIR/lustre/lustre/kernel_patches/series."
done
fi
if $XEN; then
XENPOSTFIX="-xen"
fi
+
if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH.config ]; then
- CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH.config"
+ CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH${RPMSMPTYPE:+-}${RPMSMPTYPE}.config"
fi
- # figure out our smp kernel type and set the .config if we have one
- local smptype
- for smptype in $SMPTYPES; do
- [ "$smptype" = "''" ] && smptype=
- if [ -f $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET-$TARGET_ARCH-${smptype}.config ]; then
- CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/kernel-$lnxmaj-$TARGET$XENPOSTFIX-$TARGET_ARCH-${smptype}.config"
- KERNCONFSMPTYPE=$smptype
- fi
- done
-
local lnxrelnew=${lnxrel//-/_}
# remember the EXTRA_VERSION before we diddle it here
PRISTINE_EXTRA_VERSION=$EXTRA_VERSION
if ! $PATCHLESS && [ ! -f "$CONFIG_FILE" ]; then
- fatal 1 "Config file for target $TARGET missing from" \
- "$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/."
+ fatal 1 "Config file for target $TARGET missing from $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/."
fi
if [ "$EXTRA_VERSION_save" ]; then
elif ! $RELEASE; then
# if there is no patch series, then this is not a lustre specific
# kernel. don't make it look like one
- if [ -n "$SERIES" ]; then
- #remove the @VERSION@ (lustre version)
-# EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
+ if $PATCHLESS || [ -n "$SERIES" ]; then
+ EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
# EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}"
- ! ( $PATCHLESS ) && EXTRA_VERSION="${EXTRA_VERSION}.${TIMESTAMP}"
+ if ! $PATCHLESS && [ -n "$BUILDID" ]; then
+ EXTRA_VERSION="${EXTRA_VERSION}.${BUILDID}"
+ fi
fi
fi
# EXTRA_VERSION=${EXTRA_VERSION//-/_}
}
untar() {
- local file="$1"
+ local tarfile="$1"
+ shift
+ local extractfile="$@"
- echo "Untarring ${file##*/}..."
- tar $(tarflags "$file") "$file"
+ echo "Untarring ${tarfile##*/}..."
+ tar $(tarflags "$tarfile") "$tarfile" $extractfile
}
unpack_ofed() {
- untar "$KERNELTREE/OFED-${OFED_VERSION}.tgz" || fatal 1 "Error unpacking OFED tarball"
+ if ! untar "$KERNELTREE/OFED-${OFED_VERSION}.tgz"; then
+ return 1
+ fi
[ -d OFED ] || ln -sf OFED-[0-9].[0-9]* OFED
}
fatal 1 "There was an error checking out Lustre/Portals/Build from CVS."
echo "Creating lustre tarball..."
sh autogen.sh || fatal 1 "There was an error running autogen.sh."
- ./configure --disable-{modules,utils,liblustre,tests,doc} || \
+ ./configure --enable-dist || \
fatal 1 "There was an error running ./configure to create makefiles."
make dist || fatal 1 "There was an error running 'make dist'."
LUSTRE=$PWD/lustre-*.tar.gz
local do_patch=${1:-true}
- FULL_PATCH="$PWD/lustre-kernel-${TARGET}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}.patch"
+ FULL_PATCH="$PWD/lustre-kernel-${TARGET}-${EXTRA_VERSION}.patch"
[ -f "$FULL_PATCH" ] && rm -f "$FULL_PATCH"
$do_patch && pushd linux >/dev/null
for series in $SERIES; do
fatal 1 "Error adding patch $patch to full patch."
}
if $do_patch; then
- patch -s -p1 < "$PATCH_FILE" || {
+ patch -s -p1 < "$PATCH_FILE" 2>&1 || {
rm -f $FULL_PATCH
fatal 1 "Error applying patch $patch."
}
}
build_lustre() {
+ local linux="$1"
+ local linuxobj="$2"
cp "$LUSTRE" SOURCES
pushd lustre >/dev/null
echo "Building Lustre RPMs for: $BUILD_ARCHS..."
- targets=
+ local targets arch
for arch in $BUILD_ARCHS; do
targets="--target $arch $targets"
done
- local confoptions="--with-linux=${LINUX}"
- if $PATCHLESS; then
- confoptions="--with-linux=${LINUX} --disable-server"
- fi
- if [ ! "$LINUXOBJ" = "" ]; then
- confoptions="$confoptions --with-linux-obj=${LINUXOBJ}"
- fi
+ local confoptions=""
- ./configure $confoptions ${CONFIGURE_FLAGS}
- if [ "$?" != "0" ]; then
- local saved_config="../config.log.$(date +%s)"
- cp config.log $saved_config
- chmod a+r $saved_config
- echo "Saved config.log is at $saved_config"
- popd
- return 255
+ if $PATCHLESS; then
+ confoptions="$confoptions --disable-server"
fi
- gen_lustre_version
-
- # hack. Somebody move build/lustre.spec to lustre.spec for b1_6
- local lustre_spec
- [ -f lustre.spec ] && lustre_spec=lustre.spec
- [ -f build/lustre.spec ] && lustre_spec=build/lustre.spec
-
- [ -f "$lustre_spec" ] && sed \
- -e "s^Release: .*$^Release: $LUSTRE_EXTRA_VERSION^" \
- < $lustre_spec \
- > ../lustre.spec
-
- local rpmbuildopt='-bb'
+ local rpmbuildopt='-tb'
if $NORPM; then
- rpmbuildopt='-bc'
+ rpmbuildopt='-tc'
echo NORPM mode. Only compiling.
fi
- $RPMBUILD $targets $rpmbuildopt ../lustre.spec \
- ${PATCHLESS:+--define "lustre_name lustre-client"} \
- --define "_tmppath $TMPDIR" \
- --define "_topdir $TOPDIR" || \
- fatal 1 "Error building rpms for $BUILD_ARCHS."
-
- popd >/dev/null
- ( $(skeep_ldiskfs_rpm $TAG) ) && return
+ ( $(skeep_ldiskfs_rpm $TAG) ) || {
- pushd lustre/ldiskfs || return 255
- make dist
- if [ "$?" != "0" ]; then
- popd
- return 255
- fi
- cp lustre-ldiskfs*.tar.gz $TOPDIR/SOURCES
+ pushd ldiskfs > /dev/null || return 255
- gen_lustre_version
+ if ! ./configure --enable-dist; then
+ echo "failed to configure in ldiskfs"
+ popd >/dev/null # pushd ldiskfs
+ popd >/dev/null # pushd lustre
+ return 255
+ fi
- local ldiskfs_spec=lustre-ldiskfs.spec
- [ -f "$ldiskfs_spec" ] && sed \
- -e "s^Release: .*$^Release: $LUSTRE_EXTRA_VERSION^" \
- < $ldiskfs_spec \
- > ../lustre-ldiskfs.spec
+ if ! make dist 2>&1; then
+ popd >/dev/null # pushd ldiskfs
+ popd >/dev/null # pushd lustre
+ return 255
+ fi
- $RPMBUILD $targets $rpmbuildopt ../lustre-ldiskfs.spec \
- --define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR"
- if [ "$?" != "0" ]; then
- popd
- return 255
- fi
+ #cp lustre-ldiskfs*.tar.gz $TOPDIR/SOURCES || \
+ # fatal 1 "Could not copy lustre-ldiskfs*.tar.gz to $TOPDIR/SOURCES"
- if $DO_SRC; then
- $RPMBUILD -bs ../lustre-ldiskfs.spec \
+ if ! $RPMBUILD $targets $rpmbuildopt lustre-ldiskfs*.tar.gz \
+ --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
+ --define "kdir $linux" \
+ ${linuxobj:+--define "kobjdir $linuxobj"} \
--define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR"
- if [ "$?" != "0" ]; then
- popd
+ --define "_topdir $TOPDIR" 2>&1; then
+ popd >/dev/null # pushd ldiskfs
+ popd >/dev/null # pushd lustre
return 255
fi
+
+ if $DO_SRC; then
+ if ! $RPMBUILD -ts lustre-ldiskfs*.tar.gz \
+ --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
+ --define "kdir $linux" \
+ ${linuxobj:+--define "kobjdir $linuxobj"} \
+ --define "_tmppath /var/tmp" \
+ --define "_topdir $TOPDIR" 2>&1; then
+ popd >/dev/null # pushd ldiskfs
+ popd >/dev/null # pushd lustre
+ return 255
+ fi
+ fi
+ popd >/dev/null # pushd ldiskfs
+
+ # tell lustre where ldiskfs is
+ # XXX - pointing to the RPM BUILD dir is a hack. we need to flesh
+ # out the ldiskfs RPM build so that it builds a
+ # lustre-ldiskfs-devel RPM and install that and point lustre
+ # to that instead
+ confoptions="$confoptions --with-ldiskfs=$(ls -d $TOPDIR/BUILD/lustre-ldiskfs-*)"
+ }
+
+ # convert the $PATCHLESS boolean to an empty/not-empty boolean
+ # as silly as this seems, it makes the syntax of the rpmbuild command
+ # simpler and not need an eval to deal with the quotes in the quotes
+ local is_patchless=""
+ if $PATCHLESS; then
+ is_patchless="yes"
fi
- popd
+
+ # ditto for the lustre-tests boolean
+ local lustre_tests=""
+ if ! $LUSTRE_TESTS; then
+ lustre_tests="no"
+ fi
+
+ $RPMBUILD $targets $rpmbuildopt "$LUSTRE" \
+ ${is_patchless:+--define "lustre_name lustre-client"} \
+ ${lustre_tests:+--define "build_lustre_tests 0"} \
+ ${FIND_REQUIRES:+--define "__find_requires $FIND_REQUIRES"} \
+ --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
+ --define "kdir $linux" \
+ ${linuxobj:+--define "kobjdir $linuxobj"} \
+ --define "_tmppath $TMPDIR" \
+ --define "_topdir $TOPDIR" 2>&1 || \
+ fatal 1 "Error building rpms for $BUILD_ARCHS."
+
+ popd >/dev/null
}
done
cp -v "$LUSTRE" "$STAGEDIR"
+
}
#check if we need to build separate ldiskfs RPM
skeep_ldiskfs_rpm() {
- local tag="$1"
-
- local skip=false
-
- if ! $LDISKFSRPM; then
- skip=true
- elif $PATCHLESS; then
- skip=true
- else
- for skiptag in $SKIPLDISKFSRPM; do
- [[ $tag == $skiptag ]] && skip=true && break
- done
- fi
- echo $skip
+ local tag="$1"
-}
+ local skip=false
-#generate LUSTRE_EXTRA_VERSION from EXTRA_VERSION
-gen_lustre_version() {
+ if ! $LDISKFSRPM; then
+ skip=true
+ elif $PATCHLESS; then
+ skip=true
+ else
+ for skiptag in $SKIPLDISKFSRPM; do
+ [[ $tag == $skiptag ]] && skip=true && break
+ done
+ fi
- LUSTRE_EXTRA_VERSION="${lnxmaj}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_DELIMITER}${RPMSMPTYPE:-${KERNCONFSMPTYPE:-"smp"}}"
- LUSTRE_EXTRA_VERSION=${LUSTRE_EXTRA_VERSION//-/_}
+ echo $skip
}
local infact_arch="${TARGET_ARCH}"
- RPMSMPTYPE=default
+ RPMSMPTYPE=""
[ "$infact_arch" == "i586" ] && infact_arch="i686"
local smp_type
[ $infact_arch == $smp_type ] && RPMSMPTYPE=bigsmp && break
done
+ for smp_type in $PPC64_ARCHS; do
+ [ $infact_arch == $smp_type ] && RPMSMPTYPE=ppc64 && break
+ done
+
+ for smp_type in $DEFAULT_ARCHS; do
+ [ $infact_arch == $smp_type ] && RPMSMPTYPE=default && break
+ done
+
}
# This function takes a linux source pool and digs out the linux release
}
+# XXX this needs to be re-written as a wrapper around find_rpm
+# or just gotten rid of. :-)
find_linux_rpm() {
local prefix="$1"
- local delimiter=${2:-"-"}
local pathtorpms="${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}"
[ -d $pathtorpms ] || return 255
local kernelbinaryrpm rpmfile
- local wanted_kernel="${lnxmaj}${delimiter}${lnxrel}"
+ local wanted_kernel="${lnxmaj}${lnxmin}-${lnxrel}"
local arch ret=1
for arch in $TARGET_ARCHS_ALL; do
local found_rpm="" rpm
for rpm in ${pathtorpms}/${arch}/*.rpm; do
- if rpm -q --provides -p "$rpm" | grep -q "kernel${prefix} = $wanted_kernel"; then
+ if rpm -q --provides -p "$rpm" 2>&3 | grep -q "kernel${prefix} = $wanted_kernel" 2>&3; then
+
found_rpm="$rpm"
ret=0
break
fi
done
- [ -f "$found_rpm" ] && TARGET_ARCH="$arch" && BUILD_ARCHS="$arch" && break
+ [ -f "$found_rpm" ] && break
done
echo "$found_rpm"
}
-#unpack kernel(/source/devel) RPM
+# 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_rpm() {
+unpack_linux_devel_rpm() {
local kernelrpm="${1}"
- local delimiter=${2:-"-"}
[ -f "$kernelrpm" ] || return 255
- [ -d $TOPDIR/reused ] || mkdir $TOPDIR/reused
+ [ -d $TOPDIR/reused ] || mkdir $TOPDIR/reused || return 255
- pushd $TOPDIR/reused || return 255
+ pushd $TOPDIR/reused &>/dev/null || return 255
- local RC=0
+ if ! rpm2cpio < "$kernelrpm" | cpio -id > /dev/null 2>&1; then
+ return 255
+ fi
- rpm2cpio < "$kernelrpm" | cpio -id > /dev/null 2>&1
- if [ ${PIPESTATUS[0]} -eq 0 ]; then
- # RHEL-style and SLES-style rpms
- local paths="kernels/${lnxmaj}${delimiter}${lnxrel}-${TARGET_ARCH} linux-${lnxmaj}${delimiter}${lnxrel}"
+ # call a distro specific hook, if available
+ if type -p unpack_linux_devel_rpm-$DISTRO; then
+ if ! unpack_linux_devel_rpm-$DISTRO "$kernelrpm"; then
+ return 255
+ fi
+ fi
- local path
- for path in $paths; do
- local src='usr/src'
+ popd &>/dev/null
- if [ -d "$src/$path/" ]; then
- LINUX="$(pwd)/$src/$path"
- fi
- # SLES has a separate -obj tree
- if [ -d "$src/${path}-obj" ]; then
- local src="$src/${path}-obj"
- local objects="$TARGET_ARCH/$RPMSMPTYPE"
-
- # Novell, are you *TRYING* to make life hard for me?
- if [ -d "$src/powerpc" ]; then
- objects="powerpc/$TARGET_ARCH"
- elif [ $TARGET_ARCH == 'i686' ]; then
- objects="i386/$RPMSMPTYPE"
- fi
+ find_linux_devel_paths $TOPDIR/reused
+
+ return 0
- LINUXOBJ="$(pwd)/$src/$objects"
- fi
- done
- if [ -z "$LINUX" ]; then
- RC=255
- else
- # dig out the release version
- LINUXRELEASE=$(find_linux_release ${LINUXOBJ:-$LINUX})
- if [ -z "$LINUXRELEASE" ]; then
- echo "Failed to find linux release in ${LINUXOBJ:-$LINUX}"
- RC=255
- fi
- fi
- else
- RC=255
- fi
- popd
- return $RC
}
build_kernel_ib() {
+ local linux="$1"
+
# build kernel-ib{,-devel}
- # some I/B drivers are architecture dependent and kernel-ib's configure
- # does not figure it out for us ~sigh~
- local configure_options=""
- case "$TARGET_ARCH" in
- x86_64 | ia64)
- configure_options="--with-ipath_inf-mod"
- ;;
- ppc64)
- configure_options="--with-ipath_inf-mod --with-ehca-mod"
- ;;
- esac
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
- $RPMBUILD --rebuild --define 'build_kernel_ib 1' --define 'build_kernel_ib_devel 1' \
- --define "_topdir ${TOPDIR}" --target ${TARGET_ARCH} \
- --define "KVERSION ${LINUXRELEASE}" \
- --define "$K_SRC ${LINUXOBJ:-${LINUX}}" \
- --define "LIB_MOD_DIR /lib/modules/${LINUXRELEASE}/updates" \
- --define "configure_options --without-quilt --with-core-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-srp-target-mod --with-core-mod --with-mthca-mod --with-mlx4-mod --with-cxgb3-mod --with-nes-mod --with-ipoib-mod --with-sdp-mod --with-srp-mod --without-srp-target-mod --with-rds-mod --with-iser-mod --with-qlgc_vnic-mod --with-madeye-mod $configure_options" ${TOPDIR}/OFED/SRPMS/ofa_kernel-${OFED_VERSION}-ofed${OFED_VERSION}.src.rpm
-
- if [ ${PIPESTATUS[0]} != 0 ]; then
+
+ local OFED_CORE="--with-core-mod --with-ipoib-mod --with-sdp-mod --with-user_mad-mod --with-user_access-mod --with-addr_trans-mod --with-rds-mod --with-qlgc_vnic-mod --with-madeye-mod"
+ local OFED_HARDWARE="--with-mthca-mod --with-mlx4-mod --with-mlx4_en-mod --with-cxgb3-mod --with-nes-mod"
+ # some I/B drivers are architecture dependent and kernel-ib's configure
+ # does not figure it out for us ~sigh~
+ case "$TARGET_ARCH" in
+ ppc64)
+ OFED_HARDWARE="$OFED_HARDWARE --with-ehca-mod"
+ ;;
+ esac
+ # we're no longer shipping the OFED iSCSI
+ #OFED_ISCSI="--with-srp-mod --with-srp-target-mod"
+ ## ISER module has no backport support as of OFED 1.5 (i.e. only builds on
+ ##kernels >= 2.6.30)
+ #if [[ $OFED_VERSION = 1.[0-4]* ]]; then
+ # OFED_ISCSI="$OFED_ISCSI --with-iser-mod"
+ #fi
+
+ # assume we are just rebuilding the SRPM
+ local BUILD_TYPE=${BUILD_TYPE:-"--rebuild"}
+ local SOURCE="${TOPDIR}/OFED/SRPMS/ofa_kernel-*.src.rpm"
+
+ # but switch to building from the SPEC if we need to apply patches
+ if ls ${TOPDIR}/lustre/build/patches/ofed/* >/dev/null; then
+ BUILD_TYPE="-bb"
+ rpm --define "_topdir ${TOPDIR}" -ivh $SOURCE
+ SOURCE="${TOPDIR}/SPECS/ofa_kernel.spec"
+ local file ed_fragment1 ed_fragment2 n=1
+ for file in $(ls ${TOPDIR}/lustre/build/patches/ofed/*); do
+ ed_fragment1="$ed_fragment1
+Patch$n: ${file%%*/}"
+ ed_fragment2="$ed_fragment2
+%patch$n -p0"
+ cp $file ${TOPDIR}/SOURCES
+ let n=$n+1
+ done
+
+ if [ $n -gt 1 ]; then
+ ed $SOURCE <<EOF
+/^Source: /a
+$ed_fragment1
+.
+/^%setup /a
+$ed_fragment2
+.
+wq
+EOF
+ fi
+ fi
+
+ local linuxrelease=$(find_linux_release "$linux")
+ 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 kernel-ib"
fi
- pushd "$TOPDIR" >/dev/null
- rm -rf kernel-ib-devel
- mkdir kernel-ib-devel
- cd kernel-ib-devel
- local rpm=$(ls $TOPDIR/RPMS/*/kernel-ib-devel-${OFED_VERSION}-${LINUXRELEASE//-/_}.*.rpm)
- rpm2cpio -itv < $rpm | cpio -id
- CONFIGURE_FLAGS="--with-o2ib=$(pwd)/usr/src/ofa_kernel ${CONFIGURE_FLAGS}"
- popd >/dev/null
}
store_for_reuse() {
location="$location"/"$signature"/"$module"
mkdir -p "$location"
+ # the cleanup script removes any directory that doesn't have a
+ # .lastused, so let's try to prevent that as soon as we can
+ # this solution still slightly racy with the cleanup script
+ # but the race is a lot tighter now
+ touch -t 197001010000 "$location/.lastused"
## use eval/echo here to make sure shell expansions are performed
#if ! cp -a${linkflag} $(eval echo $articles) "$location"; then
local article
for article in $(eval echo $articles); do
if ! cp -a${linkflag} "$article" "$location"; then
error "Failed to copy \"$article\" to \"$location\" in store_for_reuse()"
+ # rename the cache location so that it's not cached
+ # product, but is around for analysis
+ mv "$location"{,-bad-$(date +%s)} ||
+ error "failed to clean up a failed cache attempt" \
+ "in \"$location\" -- manual cleanup will be" \
+ "necessary"
return 1
fi
done
+ # flag the cache as complete (i.e. in case lbuild was previously
+ # interrupted while caching)
+ touch "$location/.lastused"
+
return 0
}
local use_links="${3:-false}"
local signature="$4"
- if [ -n "$REUSEBUILD" ] && [ -d $REUSEBUILD/$signature/$module ]; then
+ if [ -n "$REUSEBUILD" ] && [ -d "$REUSEBUILD/$signature/$module" ]; then
+ if [ ! -f "$REUSEBUILD/$signature/$module/.lastused" ]; then
+ # the .lastused flag is populated at the end of the caching to
+ # signal that the caching was completed. if that flag is not
+ # there, then the cache is invalid (and should be removed in fact)
+ mv "$REUSEBUILD/$signature/$module"{,-bad-$(date +%s)} ||
+ fatal 1 "failed to clean up a bad cache in location $REUSEBUILD/$signature/$module\" -- manual cleanup will be necessary"
+ return 1
+ fi
+
# so that we know how stale this entry is
touch $REUSEBUILD/$signature/$module/.lastused
+
if $use_links; then
if ls $REUSEBUILD/$signature/$module/* >/dev/null 2>&1; then
cp -al $REUSEBUILD/$signature/$module/* $dest/
find $dir -type f |
xargs ln -t $dest/RPMS/${dir##*/} -s
done
-
fi
return 0
else
}
+#
+# in a given directory, find the first rpm matching given requirements
+#
+find_rpm() {
+ local dir="$1"
+ local match_type="$2"
+ local match="$3"
+
+ pushd "$dir" > /dev/null || \
+ fatal 1 "Unable to chdir to directory \"$dir\" in find_rpm()"
+
+ local file
+ for file in $(ls *.rpm); do
+ if [ ! -f "$file" ]; then
+ continue
+ fi
+ case "$match_type" in
+ provides)
+ # match is any valid ERE (i.e. given to egrep) match
+ if rpm -q --provides -p "$file" 2>&3 | egrep -q "$match"; then
+ echo "$file"
+ popd >/dev/null
+ return 0
+ fi
+ ;;
+ *)
+ popd >/dev/null
+ fatal 1 "Unknown match type \"$match_type\" given to find_rpm()"
+ ;;
+ esac
+ done
+
+ popd >/dev/null
+ return 1
+}
+
build_kernel_with_srpm() {
+ local outfd=$1
+
+ if [ -z "$outfd" ] || [ $outfd = 1 ]; then
+ fatal 1 "You must supply a file descriptor to ${FUNCNAME[0]} and it cannot be 1"
+ fi
# need to generate the patch for this target
- do_patch_linux false >&2 # sets global $FULL_PATCH (yeah, yuck)
+ 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 REUSE_SIGNATURE=$(cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH | 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 "library"
- local CAN_LINK_FOR_REUSE=false
- touch $REUSEBUILD/$$
- if cp -al $REUSEBUILD/$$ $TOPDIR/; then
- CAN_LINK_FOR_REUSE=true
+ local release_str
+ if $RELEASE; then
+ local release_str="RELEASE=$RELEASE\n"
+ fi
+
+ if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then
+ local REUSE_SIGNATURE=$({ echo -en $release_str;
+ echo $BUILD_GEN;
+ cat $CONFIG_FILE $TARGET_FILE $FULL_PATCH; } |
+ 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
+ # "library"
+ local CAN_LINK_FOR_REUSE=false
+ touch $REUSEBUILD/$$
+ if cp -al $REUSEBUILD/$$ $TOPDIR/ 2>/dev/null; then
+ CAN_LINK_FOR_REUSE=true
+ fi
+ rm $REUSEBUILD/$$
fi
- rm $REUSEBUILD/$$
# the extra version string to use for the kernel (which might be a reused
# kernel, remember)
local kernel_extra_version=""
- if $REUSERPM && reuse kernel "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
- "$REUSE_SIGNATURE"; then
- # figure out the EXTRA_VERSION of the kernel we are re-using
- kernel_extra_version=$(ls $TOPDIR/RPMS/$TARGET_ARCH/kernel-lustre-*${lnxmaj}${EXTRA_VERSION_DELIMITER}${PRISTINE_EXTRA_VERSION}.*.$TARGET_ARCH.rpm)
- kernel_extra_version=${kernel_extra_version##*kernel-lustre-*${lnxmaj}${EXTRA_VERSION_DELIMITER}}
- kernel_extra_version=${kernel_extra_version%%.$TARGET_ARCH.rpm}
- else
+ 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
- download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM"
+ echo "Downloading kernel SRPM"
+ download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM" >&${outfd}
fi
- rpm -ivh $KERNELDIR/$KERNEL_SRPM --define "_topdir $TOPDIR" >&2 || {
- # should we clean this up or leave it for analysis?
+ if ! rpm -ivh $KERNELDIR/$KERNEL_SRPM \
+ --define "_topdir $TOPDIR" >&${outfd} 2>&1; then
+ # should we clean this up or leave it for analysis?
#rm -rf $RPMTOPDIR
fatal 1 "Error installing kernel SRPM."
- }
+ fi
# put the Lustre kernel patch into the RPM build tree
cp $FULL_PATCH $TOPDIR/SOURCES/linux-${lnxmaj}-lustre.patch
- prepare_and_build_srpm
-
- # store the resulting kernel RPM build tree for future use
- if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
- "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
- "$CAN_LINK_FOR_REUSE"; then
- error "Failed to store kernel RPMS for reuse"
- echo "unknown"
- return 1
+ prepare_and_build_srpm >&${outfd} ||
+ fatal 1 "failed to prepare_and_build_srpm"
+
+ if [ -z "$REUSE_SIGNATURE" ]; then
+ echo "No reuse signature was caculated so not storing the built kernel" >&${outfd}
+ else
+ # store the resulting kernel RPM build tree for future use
+ echo "Storing the built kernel for future reuse" >&${outfd}
+ if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
+ "kernel" "$REUSEBUILD" "$REUSE_SIGNATURE" \
+ "$CAN_LINK_FOR_REUSE"; then
+ error "Failed to store kernel RPMS for reuse"
+ echo "unknown"
+ return 1
+ fi
fi
- kernel_extra_version=$EXTRA_VERSION
- fi # build reuse
+ fi # build reuse
+
+ # figure out the EXTRA_VERSION of the kernel we built or are re-using
+ local KERNEL_RPM
+ if ! KERNEL_RPM=$(find_rpm "$TOPDIR/RPMS/$TARGET_ARCH/" provides "^kernel ="); then
+ fatal 1 "Failed to find a kernel RPM in $TOPDIR/RPMS/$TARGET_ARCH/"
+ fi
+ kernel_extra_version=$(rpm -q --queryformat "%{RELEASE}" -p $TOPDIR/RPMS/$TARGET_ARCH/$KERNEL_RPM)
# should now have the following RPMs
# $TOPDIR/RPMS/$arch/kernel-lustre-2.6.18-53.1.21.el5_lustre.1.6.5.1.$arch.rpm
}
-build_with_srpm() {
-
- if ! $PATCHLESS; then
- local kernel_extra_version
- if ! kernel_extra_version=$(build_kernel_with_srpm); then
- fatal 1 "Failed to build the kernel from it's SRPM"
- fi
-#local kernel_extra_version="60-0.33_lustre.1.8.0.50.20090311172757"
-
- for arch in $BUILD_ARCHS; do
+# build OFED
+# globals used:
+# TOPDIR
+# REUSEBUILD, USE_BUILD_CACHE
+# CONFIGURE_FLAGS
- local kernel_devel_rpm="$TOPDIR/RPMS/$arch/$(devel_kernel_name true)-$lnxmaj$EXTRA_VERSION_DELIMITER$kernel_extra_version.$arch.rpm"
+build_ofed() {
+ local linux="$1"
+ local ofed_version="$2"
- # install the -devel RPM in preparation for the lustre build
- if ! lnxrel="$kernel_extra_version" unpack_linux_rpm \
- $kernel_devel_rpm $EXTRA_VERSION_DELIMITER; then
- fatal 1 "Could not find the Linux tree in $kernel_devel_rpm"
- fi
+ # 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
- # XXX - superhack of all superhacks! kernel-lustre-devel doesn't
- # have have sources in it, so we need to pull them out of
- # the SRPM
- # yeah. blech.
- cp BUILD/kernel-lustre-${lnxmaj}/linux-${lnxmaj}.$arch/fs/ext3/*.[ch] \
- $TOPDIR/reused/usr/src/kernels/${lnxmaj}${EXTRA_VERSION_DELIMITER}${kernel_extra_version}-${arch}/fs/ext3
- 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" ${EXTRA_VERSION_DELIMITER:-"-"}); then
- fatal 1 "Could not find the kernel-$DEVEL_KERNEL_TYPE RPM in ${KERNELRPMSBASE}/${lnxmaj}/${DISTRO}"
- fi
- if ! lnxrel="$lnxrel" unpack_linux_rpm "$kernelrpm" \
- "${EXTRA_VERSION_DELIMITER:--}"; then
- fatal 1 "Could not find the Linux tree in $kernelrpm"
+ if [ "$ofed_version" = "inkernel" ]; then
+ # see if there is a distro specific override for this and use
+ # that if it exists
+ # 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
+ local ofed_location
+ ofed_location=$(build_ofed-${DISTRO} ${STDOUT})
+ local rc=${PIPESTATUS[0]}
+ CONFIGURE_FLAGS="--with-o2ib=${ofed_location} ${CONFIGURE_FLAGS}"
+ return $rc
+ else
+ return 0
fi
fi
- # before lustre, build kernel-ib
- if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then
+ # build kernel-ib
+ if $USE_BUILD_CACHE && [ -n "$REUSEBUILD" ]; then
+ local REUSE_SIGNATURE=$({ echo "$ofed_version";
+ echo "$(find_linux_release ${linux})";
+ cat "${linux}/include/linux/autoconf.h"; } |
+ 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 "library"
+ # XXX - hrm. i'm not convinced this doesn't belong in the reuse
+ # "library"
local CAN_LINK_FOR_REUSE=false
touch $REUSEBUILD/$$
if cp -al $REUSEBUILD/$$ $TOPDIR/; then
CAN_LINK_FOR_REUSE=true
fi
rm $REUSEBUILD/$$
+ fi
- local REUSE_SIGNATURE=$({ echo "$OFED_VERSION"; echo "$(find_linux_release ${LINUXOBJ:-$LINUX})"; cat "${LINUXOBJ:-${LINUX}}/include/linux/autoconf.h"; } | md5sum | cut -d" " -f1)
- if ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
- "$REUSE_SIGNATURE"; then
+ if ! $USE_BUILD_CACHE || ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
+ "$REUSE_SIGNATURE"; then
+ if [ -n "$REUSE_SIGNATURE" ]; then
# stash away the existing built articles for a moment
mkdir bak
mv {BUILD,{S,}RPMS,S{OURCE,PEC}S} bak
rm -rf bak
}
create_rpmbuild_dirs
- # build it
- build_kernel_ib
+ fi
+ # build it
+ build_kernel_ib "${linux}"
+
+ if [ -z "$REUSE_SIGNATURE" ]; then
+ echo "No reuse signature was caculated so not storing the built ofed"
+ else
+ # store the resulting RPM build tree for future use
+ echo "Storing the built ofed for future reuse"
if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
"ofed" "$REUSEBUILD" "$REUSE_SIGNATURE" \
"$CAN_LINK_FOR_REUSE"; then
fi
fi
+ pushd "$TOPDIR" >/dev/null
+ rm -rf kernel-ib-devel
+ mkdir kernel-ib-devel
+ cd kernel-ib-devel
+ # the actual ofed RPMs don't have the -rc$n or -$date string appened that
+ # might be present on the file
+ local linuxrelease=$(find_linux_release "$linux")
+ ofed_version=$(echo $ofed_version |
+ sed -re 's/-(20[0-9]{6,6}-[0-9]{4,4}|rc[0-9]*)$//')
+ local rpm=$(ls $TOPDIR/RPMS/*/kernel-ib-devel-${ofed_version}-${linuxrelease//-/_}.*.rpm)
+ if ! rpm2cpio < $rpm | cpio -id; then
+ fatal 1 "could not unpack the kernel-ib-devel rpm."
+ fi
+ CONFIGURE_FLAGS="--with-o2ib=$(pwd)/usr/src/ofa_kernel ${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}/${DISTRO}"
+ 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
+ # kernel-devel artifacts
+ cp $RPM_HELPERS_DIR/{symset-table,find-requires{,.ksyms}} .
+ FIND_REQUIRES="$(pwd)/find-requires"
+ chmod 755 {symset-table,find-requires{,.ksyms}}
+ local tmp="$(pwd)"
+ tmp="${tmp//\//\\/}"
+ ed find-requires <<EOF
+1a
+set -x
+.
+/|.*find-requires.ksyms/s/|/| bash -x/
+g/ [^ ]*\/\(find-requires\.ksyms\)/s// $tmp\/\1/g
+wq
+EOF
+ ed find-requires.ksyms <<EOF
+1a
+set -x
+.
+g/\/.*\/\(symset-table\)/s//$tmp\/\1/g
+wq
+EOF
+ ed symset-table <<EOF
+1a
+set -x
+.
+g/\(\/boot\/\)/s//$tmp\/reused\1/g
+g/\(\/usr\/src\/kernels\/\)/s//$tmp\/reused\1/g
+wq
+EOF
+
+ build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" ||
+ fatal 1 "error building OFED"
+
# now build Lustre
- if build_lustre; then
+ if build_lustre "$LINUX" "$LINUXOBJ"; then
# the build worked. resolve any symlinked files (i.e. from reuse)
# in RPMS/$arch to real files so that that that huge mess of
- # complication knows as LTS can copy them yet somewhere else.
+ # complication known as LTS can copy them yet somewhere else.
# is it any wonder this whole process is so damn so? anyone ever
- # heard of hardlinks? it this cool new thing that allows you save
+ # heard of hardlinks? it's this cool new thing that allows you save
# tons of time and space by creating... well you can go read about
# them if you have not heard about them yet.
# can i say how much the implemenation of all of this really impedes
# RPM reuse?
- pushd RPMS/$TARGET_ARCH
- for file in *; do
+ local dir
+ for dir in RPMS/*; do
+ pushd $dir
+ for file in $(ls); do
if [ -h $file ]; then
cp $file foo
mv foo $file
fi
done
- popd
+ popd
+ done
+ # also, for i?86, make sure all of the RPMs are in RPMS/$TARGET_ARCH
+ # as that's where LTS expects to find them
+ for dir in RPMS/*; do
+ if [ $dir = RPMS/$TARGET_ARCH ]; then
+ continue
+ fi
+ pushd $dir
+ local files=$(ls)
+ if [ -n "$files" ]; then
+ cp -al $files ../$TARGET_ARCH
+ fi
+ popd
+ done
+ else
+ return 1
fi
+
}
create_rpmbuild_dirs() {
- if [ ! -d RPMS ]; then
- mkdir -p RPMS
- for arch in $BUILD_ARCHS; do
- mkdir RPMS/$arch
- done
- fi
+ [ -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 BUILD ] || mkdir BUILD
[ -d SOURCES ] || mkdir SOURCES
[ -d SPECS ] || mkdir SPECS
funcname=${FUNCNAME[$n - 1]}
sourcefile=$(basename ${BASH_SOURCE[$n]})
lineno=${BASH_LINENO[$n - 1]}
+ if [ $n = 1 ]; then
+ let lineno-=11
+ fi
# Display function arguments
if [[ ! -z "${BASH_ARGV[@]}" ]]; then
local args newarg j p=0
args="${args:+${args} }'${newarg}'"
done
let p+=${BASH_ARGC[$n - 1]}
- fi
+ fi
echo " ${funcname} ${args:+${args} }at ${sourcefile}:${lineno}"
done
#echo ${FUNCNAME[*]}
local i=$((${#FUNCNAME[@]} - 1))
while [ $i -ge 0 ]; do
- local SOURCELINE="${BASH_SOURCE[$i + 1]}:${BASH_LINENO[$i]}"
+ local lineno=${BASH_LINENO[$i]}
+ if [ $i = 0 ]; then
+ let lineno-=11
+ fi
+ local SOURCELINE="${BASH_SOURCE[$i + 1]}:${lineno}"
# Can't figure out how to get function args from other frames...
local FUNCTION="${FUNCNAME[$i]}()"
echo "$SOURCELINE:$FUNCTION"
}
+seen_list=$(new_list)
+trap 'set +x;
+echo "An unexpected error has occurred at ${BASH_SOURCE[0]##*/}:$((LINENO-1)).
+Unfortunately the above line number in the message may or may not be correct,
+but details have been send to the lbuild maintainer. Attempting to continue."; (echo "Untrapped error"
+echo
+# have we seen this one
+echo "checking seen list for ${BASH_SOURCE[0]}:${BASH_LINENO[0]}"
+
+if is_list_member "$seen_list" "${BASH_SOURCE[0]}:${BASH_LINENO[0]}"; then
+ echo "seen this one already"
+else
+ seen_list=$(add_list "$seen_list" "${BASH_SOURCE[0]}:${BASH_LINENO[0]}")
+fi
+backtrace
+echo
+echo "Environment:"
+set
+) | mail -s "Untrapped error at ${BASH_SOURCE[0]##*/}:$((LINENO-15)) on $HOSTNAME" brian@sun.com >&2; set $xtrace' ERR
+set -E
+
[ -r ~/.lbuildrc ] && . ~/.lbuildrc
-options=$(getopt -o d:D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ldiskfs,ccache,reuse:,norpm,disable-datestamp,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,publish,release,src,stage:,tag:,target:,target-archs:,with-linux:,xen -- "$@")
+options=$(getopt -o d:D:h -l kerneltree:,distro:,kernelrpm:,reusebuild:,patchless,ldiskfs,ccache,reuse:,norpm,disable-datestamp,external-patches:,timestamp:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,ofed-version:,publish,release,set-value:,src,stage:,tag:,target:,target-archs:,with-linux:,xen -- "$@")
if [ $? != 0 ]; then
usage 1
shift 2
;;
--lustre)
- LUSTRE=$2
+ if ! LUSTRE=$(canon_filepath "$2"); then
+ fatal 1 "Could not determine the canonical location of $2"
+ fi
shift 2
;;
--nodownload)
DO_SRC=false
shift 1
;;
+ --ofed-version)
+ OFED_VERSION="$2"
+ shift 2
+ ;;
--publish)
shift
;;
XEN=true
shift
;;
+ --set-value)
+ eval $2
+ shift 2
+ ;;
--)
shift
+ # there are actually some lustre configure flags that we need to
+ # handle ourselves (but we still give them to configure)
+ if [[ \ $@\ == *\ --disable-tests\ * ]]; then
+ LUSTRE_TESTS=false
+ fi
CONFIGURE_FLAGS=$@
CONFIGURE_FLAGS="$CONFIGURE_FLAGS --enable-liblustre --enable-liblustre-tests"
break
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)
+
load_target
-EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then
download_ofed
- unpack_ofed
+ unpack_ofed || fatal 1 "Error unpacking OFED tarball"
fi
# make sure the RPM build environment is set up
create_rpmbuild_dirs
-trap '[ -n "$CCACHE" ] && ccache -s' EXIT
-
# 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
- build_lustre
+ build_ofed "${LINUXOBJ:-$LINUX}" "$OFED_VERSION" ||
+ fatal 1 "error building OFED"
+ build_lustre "$LINUX" "$LINUXOBJ"
else
if [ -f "${0%/*}/lbuild-$DISTRO" ]; then
- seen_list=$(new_list)
- trap '(echo "Untrapped error"
-echo
-# have we seen this one
-echo "checking seen list for ${BASH_SOURCE[0]}:${BASH_LINENO[0]}"
-
-if is_list_member "$seen_list" "${BASH_SOURCE[0]}:${BASH_LINENO[0]}"; then
- echo "seen this one already"
-else
- seen_list=$(add_list "$seen_list" "${BASH_SOURCE[0]}:${BASH_LINENO[0]}")
-fi
-backtrace
-echo
-echo "Environment:"
-set
-) | tee >(mail -s "Untrapped error in lbuild on $MACHINENAME" brian@sun.com) >&2' ERR
- set -E
-
source ${0%/*}/lbuild-$DISTRO
build_with_srpm || fatal 1 "Failed to build_with_srpm"
else
+ EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
source ${0%/*}/lbuild.old_school
old_school_download_kernel
git://git.whamcloud.com / fs / lustre-release.git / blobdiff