# 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
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
# 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
}
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
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}
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" ||
+ 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."
+ fatal 1 "Could not download target $target's kernel SRPM $srpm from $location."
fi
else
fatal 1 "$srpm not found in directory $KERNELDIR."
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-([0-9]+\.[0-9]+-${daily}-[0-9]{4,4}).tgz.*$/\1/p" | tail -1)
+ 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
[ -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
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
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."
}
confoptions="$confoptions --with-linux-obj=${linuxobj}"
fi
- ./configure $confoptions ${CONFIGURE_FLAGS}
+ ./configure $confoptions ${CONFIGURE_FLAGS} 2>&1
if [ "$?" != "0" ]; then
local saved_config="../config.log.$(date +%s)"
cp config.log $saved_config
echo NORPM mode. Only compiling.
fi
- # convert the $PATCHLESS boolean to an empty/no-empty boolean
+ # 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
+
+ # ditto for the lustre-tests boolean
+ local lustre_tests=""
+ if ! $LUSTRE_TESTS; then
+ lustre_tests="no"
+ fi
+
$RPMBUILD $targets $rpmbuildopt ../lustre.spec \
${is_patchless:+--define "lustre_name lustre-client"} \
+ ${lustre_tests:+--define "build_lustre_tests 0"} \
+ --define "configure_args $confoptions ${CONFIGURE_FLAGS}" \
--define "_tmppath $TMPDIR" \
- --define "_topdir $TOPDIR" || \
+ --define "_topdir $TOPDIR" 2>&1 || \
fatal 1 "Error building rpms for $BUILD_ARCHS."
popd >/dev/null
( $(skeep_ldiskfs_rpm $TAG) ) && return
pushd lustre/ldiskfs || return 255
- make dist
+ make dist 2>&1
if [ "$?" != "0" ]; then
popd
return 255
< $ldiskfs_spec \
> ../lustre-ldiskfs.spec
- $RPMBUILD $targets $rpmbuildopt ../lustre-ldiskfs.spec \
+ if ! $RPMBUILD $targets $rpmbuildopt ../lustre-ldiskfs.spec \
--define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR"
- if [ "$?" != "0" ]; then
+ --define "_topdir $TOPDIR" 2>&1; then
popd
return 255
fi
if $DO_SRC; then
- $RPMBUILD -bs ../lustre-ldiskfs.spec \
+ if ! $RPMBUILD -bs ../lustre-ldiskfs.spec \
--define "_tmppath /var/tmp" \
- --define "_topdir $TOPDIR"
- if [ "$?" != "0" ]; then
+ --define "_topdir $TOPDIR" 2>&1; then
popd
return 255
fi
#generate LUSTRE_EXTRA_VERSION from EXTRA_VERSION
gen_lustre_version() {
- LUSTRE_EXTRA_VERSION="${lnxmaj}${EXTRA_VERSION_DELIMITER}${EXTRA_VERSION}${TARGET_DELIMITER}${RPMSMPTYPE}"
+ LUSTRE_EXTRA_VERSION="${lnxmaj}-${EXTRA_VERSION}${FLAVOR_DELIMITER}${RPMSMPTYPE}"
LUSTRE_EXTRA_VERSION=${LUSTRE_EXTRA_VERSION//-/_}
}
# 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
# lustre itself)
unpack_linux_devel_rpm() {
local kernelrpm="${1}"
- # it's worth noting that neither sles10 nor rhel5 appear to use their
- # extra_version delimiter for the dirname under /usr/src, so we could
- # probably just get rid of this parameter
- local delimiter=${2:-"-"}
[ -f "$kernelrpm" ] || return 255
[ -d $TOPDIR/reused ] || mkdir $TOPDIR/reused || return 255
- pushd $TOPDIR/reused || return 255
+ pushd $TOPDIR/reused &>/dev/null || return 255
if ! rpm2cpio < "$kernelrpm" | cpio -id > /dev/null 2>&1; then
return 255
# call a distro specific hook, if available
if type -p unpack_linux_devel_rpm-$DISTRO; then
- unpack_linux_devel_rpm-$DISTRO "$kernelrpm"
+ if ! unpack_linux_devel_rpm-$DISTRO "$kernelrpm"; then
+ return 255
+ fi
fi
- popd
+ popd &>/dev/null
find_linux_devel_paths $TOPDIR/reused
}
-# XXX - this rhel/sles goop needs abstracting out into the
-# lbuild-{rhel5,sles10} method files
-find_linux_devel_paths() {
- local path="$1"
-
- local RC=0
-
- pushd $path
- # RHEL-style and SLES-style rpms
- # XXX - until bug 19336 cleans this up, we need to extricate the
- # ${lnxmin}- from the $lnxrel
- local paths="kernels/${lnxmaj}${lnxmin}${delimiter}${lnxrel}-${TARGET_ARCH} linux-${lnxmaj}${lnxmin}${delimiter}${lnxrel##${lnxmin#.}-}"
-
- local path
- for path in $paths; do
- local src='usr/src'
-
- 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
-
- 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
- popd
- return $RC
-}
-
build_kernel_ib() {
local linux="$1"
fi
local linuxrelease=$(find_linux_release "$linux")
- $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}
-
- if [ ${PIPESTATUS[0]} != 0 ]; then
+ 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 kernel-ib"
fi
# 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"
+ fatal 1 "failed to clean up a bad cache in location $REUSEBUILD/$signature/$module\" -- manual cleanup will be necessary"
return 1
fi
case "$match_type" in
provides)
# match is any valid ERE (i.e. given to egrep) match
- if rpm -q --provides -p "$file" | egrep -q "$match"; then
+ if rpm -q --provides -p "$file" 2>&3 | egrep -q "$match"; then
echo "$file"
popd >/dev/null
return 0
}
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
if $RELEASE; then
local release_str="RELEASE=$RELEASE\n"
fi
- 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/; then
- CAN_LINK_FOR_REUSE=true
+ 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" \
+ 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" >&2
+ echo "Downloading kernel SRPM"
+ download_srpm "$CANONICAL_TARGET" "$KERNEL_SRPM" >&${outfd}
fi
if ! rpm -ivh $KERNELDIR/$KERNEL_SRPM \
- --define "_topdir $TOPDIR" >&2; then
+ --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."
# put the Lustre kernel patch into the RPM build tree
cp $FULL_PATCH $TOPDIR/SOURCES/linux-${lnxmaj}-lustre.patch
- prepare_and_build_srpm >&2
-
- # 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
fi # build reuse
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
- ${TOPDIR}/SPECS/mptlinux.spec; then
+ ${TOPDIR}/SPECS/mptlinux.spec 2>&1; then
return 1
fi
if $DO_SRC; then
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
- ${TOPDIR}/SPECS/mptlinux.spec; then
+ ${TOPDIR}/SPECS/mptlinux.spec 2>&1; then
return 1
fi
fi
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
- ${TOPDIR}/SPECS/rdac.spec; then
+ ${TOPDIR}/SPECS/rdac.spec 2>&1; then
return 1
fi
if $DO_SRC; then
--define "_tmppath /var/tmp" \
--define "_topdir ${TOPDIR}" \
--define "kernel_obj $linux" \
- ${TOPDIR}/SPECS/rdac.spec; then
+ ${TOPDIR}/SPECS/rdac.spec 2>&1; then
return 1
fi
fi
# build OFED
# globals used:
# TOPDIR
-# REUSEBUILD, REUSERPM
+# REUSEBUILD, USE_BUILD_CACHE
# CONFIGURE_FLAGS
build_ofed() {
return 0
fi
- if [ -n "$REUSEBUILD" ]; then
+ 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
rm $REUSEBUILD/$$
fi
- local REUSE_SIGNATURE=$({ echo "$ofed_version";
- echo "$(find_linux_release ${linux})";
- cat "${linux}/include/linux/autoconf.h"; } |
- md5sum | cut -d" " -f1)
- if ! $REUSERPM || ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
+ if ! $USE_BUILD_CACHE || ! reuse ofed "$TOPDIR" "$CAN_LINK_FOR_REUSE" \
"$REUSE_SIGNATURE"; then
- # stash away the existing built articles for a moment
- mkdir bak
- mv {BUILD,{S,}RPMS,S{OURCE,PEC}S} bak
- function mv_back {
- pushd bak
- find . | cpio -pudlm ..
- popd
- rm -rf bak
- }
- create_rpmbuild_dirs
+ 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
+ function mv_back {
+ pushd bak
+ find . | cpio -pudlm ..
+ popd
+ rm -rf bak
+ }
+ create_rpmbuild_dirs
+ fi
# build it
build_kernel_ib "${linux}"
- if ! store_for_reuse "$TOPDIR/{SPECS,SOURCES,BUILD,SRPMS,RPMS}" \
- "ofed" "$REUSEBUILD" "$REUSE_SIGNATURE" \
- "$CAN_LINK_FOR_REUSE"; then
- error "Failed to store OFED RPMS for reuse"
+
+ 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
+ error "Failed to store OFED RPMS for reuse"
+ mv_back
+ return 1
+ fi
+ # put the stuff we stashed away back
mv_back
- return 1
fi
- # put the stuff we stashed away back
- mv_back
fi
pushd "$TOPDIR" >/dev/null
if ! $PATCHLESS; then
local kernel_extra_version
- if ! kernel_extra_version=$(build_kernel_with_srpm); then
+ if ! kernel_extra_version=$(build_kernel_with_srpm ${STDOUT}); then
fatal 1 "Failed to build the kernel from it's SRPM"
fi
fi
# install the -devel RPM in preparation for the lustre build
- # note that the EXTRA_VERSION_DELIMITER is *NOT* used in the
- # version of the directory name under /usr/src
if ! lnxrel="$kernel_extra_version" unpack_linux_devel_rpm \
- "$TOPDIR/RPMS/$arch/$kernel_devel_rpm" "-"; then
+ "$TOPDIR/RPMS/$arch/$kernel_devel_rpm"; then
fatal 1 "Could not find the Linux tree in $TOPDIR/RPMS/$arch/$kernel_devel_rpm"
fi
done
# 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
+ 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
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 fail may or may not be correct,
+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
[ -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,ofed-version:,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
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
load_target
-EXTRA_VERSION_DELIMITER=${EXTRA_VERSION_DELIMITER:-"-"}
if [ -n "$OFED_VERSION" -a "$OFED_VERSION" != "inkernel" ]; then
download_ofed
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