X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Flbuild;h=c76732792b980c95d52d45ab36fbfc2b53b66d22;hp=49888f755b61e45e607d68afd39e31ee3cd69ee7;hb=4ecae3cd5af60e389eba1e6eff2913b09f557203;hpb=06830095868bdcb4176debf9a83850adbc5b27c3

diff --git a/build/lbuild b/build/lbuild
index 49888f7..c767327 100755
--- a/build/lbuild
+++ b/build/lbuild
@@ -1,12 +1,13 @@
 #!/bin/sh
 
+# vim:expandtab:shiftwidth=4:softtabstop=4:tabstop=4:
+
 TOPDIR=$PWD
 
 # CVSROOT is inherited from the environment
 KERNELDIR=
 LINUX=
 LUSTRE=
-PUBLISH=0
 RELEASE=0
 DO_SRC=0
 DOWNLOAD=1
@@ -16,6 +17,7 @@ TARGET_ARCHS=
 CONFIGURE_FLAGS=
 EXTERNAL_PATCHES=
 EXTRA_VERSION=
+STAGEDIR=
 
 # from target file
 KERNEL=
@@ -49,10 +51,10 @@ readlink() {
     local path=$1 ll
 
     if [ -L "$path" ]; then
-	ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
-	echo "${ll/* -> }"
+        ll="$(LC_ALL=C ls -l "$path" 2> /dev/null)" &&
+        echo "${ll/* -> }"
     else
-	return 1
+        return 1
     fi
 }
 
@@ -73,11 +75,6 @@ fatal()
     exit $1
 }
 
-publishing()
-{
-    (( $PUBLISH )) || return 0
-}
-
 is_release()
 {
     (( $RELEASE )) || return 0
@@ -87,8 +84,8 @@ list_targets()
 {
     echo -n "Available targets:"
     for target in $TOPDIR/lustre/lustre/kernel_patches/targets/*.target ; do
-	target_file=${target##*/}
-	echo -n " ${target_file%%.target}"
+        target_file=${target##*/}
+        echo -n " ${target_file%%.target}"
     done
     echo
 }
@@ -131,7 +128,7 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     tarball.
 
   --publish
-    Publish the packages, patches, and tarballs on the ftp server.
+    Unused.
 
   --release
     Specifies that the files generated do not include timestamps, and
@@ -140,6 +137,11 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
   --src
     Build a .src.rpm, a full kernel patch, and a patched kernel tarball.
 
+  --stage=DIR
+    Directory used to stage packages for release.  RPMs will be placed
+    more or less in DIR/<target>-<arch>, and the tarball will be
+    placed in DIR.
+
   --tag=TAG
     A CVS branch/tag name to build from when pulling from CVS.
 
@@ -172,41 +174,60 @@ EOF
 check_options()
 {
     if [ "$LUSTRE" ] ; then
-	[ -r "$LUSTRE" ] || \
-	    usage 1 "Could not find Lustre source tarball '$LUSTRE'."
+        [ -r "$LUSTRE" ] || \
+            usage 1 "Could not find Lustre source tarball '$LUSTRE'."
     else
-	[ "$CVSROOT" ] || \
-	    usage 1 "Either specify a CVS Root with -d, or a Lustre source tarball with --lustre."
-	[ "$TAG" ] || \
-	    usage 1 "A branch/tag name must be specified with --tag when not building from a tarball."
+        [ "$CVSROOT" ] || \
+            usage 1 "Either specify a CVS Root with -d, or a Lustre source tarball with --lustre."
+        [ "$TAG" ] || \
+            usage 1 "A branch/tag name must be specified with --tag when not building from a tarball."
     fi
 
     if [ -z "$LINUX" ] ; then
-	[ "$KERNELDIR" ] || \
-	    usage 1 "A kernel directory must be specified with --kerneldir."
+        [ "$KERNELDIR" ] || \
+            usage 1 "A kernel directory must be specified with --kerneldir."
 
-	[ -d "$KERNELDIR" ] || \
-	    usage 1 "$KERNELDIR is not a directory."
+        [ -d "$KERNELDIR" ] || \
+            usage 1 "$KERNELDIR is not a directory."
 
-	if ! (( $RELEASE )) ; then
-	    [ "$TAG" ] || \
-		usage 1 "When building a snapshot, a tag name must be used."
-	fi
+        if ! (( $RELEASE )) ; then
+            [ "$TAG" ] || \
+                usage 1 "When building a snapshot, a tag name must be used."
+        fi
 
-	[ "$TARGET" ] || usage 1 "A target must be specified with --target."
+        [ "$TARGET" ] || usage 1 "A target must be specified with --target."
 #       TARGET_FILE="$TOPDIR/lustre/kernel_patches/targets/$TARGET.target"
 #       [ -r "$TARGET_FILE" ] || \
-#       	usage 1 "Target '$TARGET' was not found."
+#               usage 1 "Target '$TARGET' was not found."
     fi
 
+    case $TARGET in
+        2.6-rhel4)
+            CANONICAL_TARGET="rhel-2.6"
+            ;;
+        2.6-suse)
+            CANONICAL_TARGET="sles-2.6"
+            ;;
+        hp_pnnl-2.4)
+            CANONICAL_TARGET="hp-pnnl-2.4"
+            ;;
+        2.6-vanilla \
+            | suse-2.4.21-2 \
+            | rh-2.4 \
+            | rhel-2.4 \
+            | sles-2.4)
+                CANONICAL_TARGET="$TARGET"
+                ;;
+    esac
+
     TIMESTAMP=$(date -d "$DATE" "+%Y%m%d%H%M")
 
     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
+        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
     fi
 }
 
@@ -215,77 +236,113 @@ uniqify()
     echo $(echo "$*" | xargs -n 1 | sort -u)
 }
 
+build_tarball() {
+    local TARGET=$1
+    local SRPM=$2
+
+    if [ "$TARGET" = "rhel-2.6" -o "$TARGET" = "rhel-2.4" ]; then
+        local SPEC=""
+        if [ "$TARGET" = "rhel-2.6" ]; then
+            SPEC=kernel-2.6.spec
+            OLDCONFIG=nonint_oldconfig
+        elif [ "$TARGET" = "rhel-2.4" ]; then
+            SPEC=kernel-2.4.spec
+            OLDCONFIG=oldconfig
+        fi
+
+        RPMTOPDIR=$(mktemp -d $KERNELDIR/rpm_XXXXXX)
+        mkdir $RPMTOPDIR/BUILD/
+        rpm -ivh $KERNELDIR/$SRPM --define "_topdir $RPMTOPDIR" || \
+            { rm -rf $RPMTOPDIR; fatal 1 "Error installing kernel SRPM."; }
+        $RPMBUILD -bp --nodeps --target i686 $RPMTOPDIR/SPECS/$SPEC --define "_topdir $RPMTOPDIR"
+        pushd $RPMTOPDIR/BUILD/kernel-${lnxmaj}/linux-${lnxmaj} && {
+            make mrproper
+            cp configs/kernel-${lnxmaj}-i686-smp.config .config
+            if ! make $OLDCONFIG > /dev/null; then
+                fatal 1 "error trying to make $OLDCONFIG while building a tarball from SRPM."
+            fi
+            make include/linux/version.h 
+            rm -f .config
+            cd ..
+            tar cjf $KERNEL_FILE linux-${lnxmaj}
+        }
+        popd
+        rm -rf $RPMTOPDIR
+    fi
+}
+
+download_and_build_tarball() {
+    local TARGET=$1
+    local KERNEL_FILE=$2
+
+    local SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
+
+    echo "Downloading http://ftp.lustre.org/kernels/$TARGET/old/$SRPM..."
+    if ! wget -nv "http://ftp.lustre.org/kernels/$TARGET/old/$SRPM" \
+        -O "$KERNELDIR/$SRPM" ; then
+        fatal 1 "Could not download target $TARGET's kernel SRPM $SRPM from ftp.lustre.org."
+    fi
+
+    build_tarball $TARGET $SRPM
+}
+
 load_target()
 {
     EXTRA_VERSION_save="$EXTRA_VERSION"
     for patchesdir in "$EXTERNAL_PATCHES" "$TOPDIR/lustre/lustre/kernel_patches" ; do
-	TARGET_FILE="$patchesdir/targets/$TARGET.target"
-	[ -r "$TARGET_FILE" ] && break
+        TARGET_FILE="$patchesdir/targets/$TARGET.target"
+        [ -r "$TARGET_FILE" ] && break
     done
     [ -r "$TARGET_FILE" ] || \
-	fatal 1 "Target $TARGET was not found."
+        fatal 1 "Target $TARGET was not found."
 
-    echo "Loading target config file $TARGET.target..."	
+    echo "Loading target config file $TARGET.target..."        
 
     . "$TARGET_FILE"
 
     [ "$KERNEL"  ] || fatal 1 "Target $TARGET did not specify a kernel."
-#    [ "$SERIES"  ] || fatal 1 "Target $TARGET did not specify a kernel patch series."
-#    [ "$CONFIG"  ] || fatal 1 "Target $TARGET did not specify a kernel config."
     [ "$VERSION" ] || fatal 1 "Target $TARGET did not specify a kernel version."
 
     if [ "$KERNELDIR" ] ; then
-	KERNEL_FILE="$KERNELDIR/$KERNEL"
-	if [ ! -r "$KERNELDIR/$KERNEL" ] ; then
-	    case $TARGET in
-		2.6-rhel4)
-		    dldir="rhel-2.6"
-		    ;;
-		2.6-suse)
-		    dldir="suse-2.6"
-		    ;;
-		hp_pnnl-2.4)
-		    dldir="hp-pnnl-2.4"
-		    ;;
-		2.6-vanilla \
-		| suse-2.4.21-2 \
-		| rh-2.4 \
-		| rhel-2.4 \
-		| sles-2.4)
-		    dldir="$TARGET"
-		    ;;
-	    esac
-	    if (( $DOWNLOAD )) ; then
-		echo "Downloading http://ftp.lustre.org/kernels/$dldir/old/$KERNEL..."
-		if ! wget -nv "http://ftp.lustre.org/kernels/$dldir/old/$KERNEL" \
-		    -O "$KERNELDIR/$KERNEL" ; then
-		    fatal 1 "Could not download target $TARGET's kernel file $KERNEL from ftp.lustre.org."
-		fi
-	    else
-		fatal 1 "Target $TARGET's kernel file $KERNEL not found in kernel directory $KERNELDIR."
-	    fi
-	fi
+        KERNEL_FILE="$KERNELDIR/$KERNEL"
+        if [ ! -r "$KERNELDIR/$KERNEL" ] ; then
+            # see if we have an SRPM we can build a tarball for
+            KERNEL_SRPM=kernel-${lnxmaj}-${lnxrel}.src.rpm
+            if [ -r "$KERNELDIR/$KERNEL_SRPM" ] ; then
+                build_tarball $CANONICAL_TARGET $KERNEL_SRPM
+            else
+                if (( $DOWNLOAD )) ; then
+                    echo "Downloading http://ftp.lustre.org/kernels/$CANONICAL_TARGET/old/$KERNEL..."
+                    if ! wget -nv "http://ftp.lustre.org/kernels/$CANONICAL_TARGET/old/$KERNEL" -O "$KERNELDIR/$KERNEL" ; then
+                        # see if we can do it with an SRPM from the download site
+                        download_and_build_tarball $CANONICAL_TARGET $KERNEL_FILE
+                    fi
+                else
+                    fatal 1 "Target $TARGET's kernel file $KERNEL not found in kernel directory $KERNELDIR."
+                fi
+            fi
+        fi
     fi
 
     if [ "$SERIES" ] ; then
         for series in $SERIES ; do
-	    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."
-	done
+            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."
+        done
     fi
 
     CONFIG_FILE="$TOPDIR/lustre/lustre/kernel_patches/kernel_configs/$CONFIG"
     [ -r "$CONFIG_FILE" ] || \
-	fatal 1 "Target $TARGET's config file $CONFIG missing from $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/."
+        fatal 1 "Target $TARGET's config file $CONFIG missing from $TOPDIR/lustre/lustre/kernel_patches/kernel_configs/."
 
     if [ "$EXTRA_VERSION_save" ] ; then
-	EXTRA_VERSION="$EXTRA_VERSION_save"
+        EXTRA_VERSION="$EXTRA_VERSION_save"
     elif ! (( $RELEASE )) ; then
-	#remove the @VERSION@ (lustre version)
-	EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
-	EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}"
+        #remove the @VERSION@ (lustre version)
+        EXTRA_VERSION=$(echo $EXTRA_VERSION | sed -e "s/\(.*_lustre\)\..*/\1/")
+        EXTRA_VERSION="${EXTRA_VERSION}-${TAG}.${TIMESTAMP}"
     fi
     # EXTRA_VERSION=${EXTRA_VERSION//-/_}
 
@@ -293,9 +350,9 @@ load_target()
 
     BUILD_ARCHS=
     for arch in $(uniqify "$ALL_ARCHS") ; do
-	if [ -z "$TARGET_ARCHS" ] || echo "$TARGET_ARCHS" | grep "$arch" >/dev/null 2>/dev/null ; then
-	    BUILD_ARCHS="$BUILD_ARCHS $arch"
-	fi
+        if [ -z "$TARGET_ARCHS" ] || echo "$TARGET_ARCHS" | grep "$arch" >/dev/null 2>/dev/null ; then
+            BUILD_ARCHS="$BUILD_ARCHS $arch"
+        fi
     done
     [ "$BUILD_ARCHS" ] || usage 1 "No available target archs to build."
     echo "Building for: $BUILD_ARCHS"
@@ -304,21 +361,21 @@ load_target()
 tarflags()
 {
     case "$1" in
-	'')
-	    fatal 1 "tarflags(): File name argument missing."
-	    ;;
-	*.tar.gz)
-	    echo 'zxf'
-	    ;;
-	*.tar.bz2)
-	    echo 'jxf'
-	    ;;
-	*.tar)
-	    echo 'xf'
-	    ;;
-	*)
-	    fatal 1 "tarflags(): Unrecognized tar extension in file: $1"
-	    ;;
+        '')
+            fatal 1 "tarflags(): File name argument missing."
+            ;;
+        *.tar.gz | *.tgz)
+            echo 'zxf'
+            ;;
+        *.tar.bz2)
+            echo 'jxf'
+            ;;
+        *.tar)
+            echo 'xf'
+            ;;
+        *)
+            fatal 1 "tarflags(): Unrecognized tar extension in file: $1"
+            ;;
     esac
 }
 
@@ -332,30 +389,30 @@ unpack_lustre()
 {
     DIRNAME="lustre-$TAG-$TIMESTAMP"
     if [ "$LUSTRE" ] ; then
-	untar "$LUSTRE"
-	[ -d lustre ] || ln -sf lustre* lustre
+        untar "$LUSTRE"
+        [ -d lustre ] || ln -sf lustre* lustre
     else
-	if [ "$USE_DATESTAMP" ]; then
-	    DATESTAMP="-D '$DATE'"
-	else
-	    DATESTAMP=""
-	fi	    
-
-	cvs -d "$CVSROOT" -qz3 co $DATESTAMP -d "$DIRNAME" lustre || \
-	    fatal 1 "There was an error checking out toplevel Lustre from CVS."
-	pushd "$DIRNAME" > /dev/null
-	./lustrecvs "$TAG" || \
-	    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} || \
-	    fatal 1 "There was an error running ./configure to create makefiles."
-	make dist || fatal 1 "There was an error running 'make dist'."
-	popd > /dev/null
-	fname=`basename $DIRNAME/lustre-*.tar.gz`
-	cp $DIRNAME/$fname . || fatal 1 "There was an error copying lustre tarball."
-	LUSTRE="$PWD/$fname"
-	ln -sf "$DIRNAME" lustre
+        if [ "$USE_DATESTAMP" ]; then
+            DATESTAMP="-D '$DATE'"
+        else
+            DATESTAMP=""
+        fi            
+
+        cvs -d "$CVSROOT" -qz3 co $DATESTAMP -d "$DIRNAME" lustre || \
+            fatal 1 "There was an error checking out toplevel Lustre from CVS."
+        pushd "$DIRNAME" > /dev/null
+        ./lustrecvs "$TAG" || \
+            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} || \
+            fatal 1 "There was an error running ./configure to create makefiles."
+        make dist || fatal 1 "There was an error running 'make dist'."
+        popd > /dev/null
+        fname=`basename $DIRNAME/lustre-*.tar.gz`
+        cp $DIRNAME/$fname . || fatal 1 "There was an error copying lustre tarball."
+        LUSTRE="$PWD/$fname"
+        ln -sf "$DIRNAME" lustre
     fi
 }
 
@@ -372,22 +429,22 @@ patch_linux()
     [ -f "$FULL_PATCH" ] && rm -f "$FULL_PATCH"
     pushd linux >/dev/null
     for series in $SERIES ; do
-	echo -n "Applying series $series:"
-	for patchesdir in "$EXTERNAL_PATCHES" "$TOPDIR/lustre/lustre/kernel_patches" ; do
-	    [ -r "$patchesdir/series/$series" ] || continue
-	    SERIES_FILE="$patchesdir/series/$series"
-	    for patch in $(<"$SERIES_FILE") ; do
-		echo -n " $patch"
-		PATCH_FILE="$patchesdir/patches/$patch"
-		[ -r "$PATCH_FILE" ] || \
-		    fatal 1 "Patch $patch does not exist in Lustre tree."
-		cat "$PATCH_FILE" >> "$FULL_PATCH" || \
-		    fatal 1 "Error adding patch $patch to full patch."
-		patch -s -p1 < "$PATCH_FILE" || fatal 1 "Error applying patch $patch."
-	    done
-	    break
-	done
-	echo
+        echo -n "Applying series $series:"
+        for patchesdir in "$EXTERNAL_PATCHES" "$TOPDIR/lustre/lustre/kernel_patches" ; do
+            [ -r "$patchesdir/series/$series" ] || continue
+            SERIES_FILE="$patchesdir/series/$series"
+            for patch in $(<"$SERIES_FILE") ; do
+                echo -n " $patch"
+                PATCH_FILE="$patchesdir/patches/$patch"
+                [ -r "$PATCH_FILE" ] || \
+                    fatal 1 "Patch $patch does not exist in Lustre tree."
+                cat "$PATCH_FILE" >> "$FULL_PATCH" || \
+                    fatal 1 "Error adding patch $patch to full patch."
+                patch -s -p1 < "$PATCH_FILE" || fatal 1 "Error applying patch $patch."
+            done
+            break
+        done
+        echo
     done
     popd >/dev/null
     echo "Full patch has been saved in ${FULL_PATCH##*/}."
@@ -397,11 +454,11 @@ patch_linux()
     rm -f linux/configs/*
     copysuccess=0
     for patchesdir in "$EXTERNAL_PATCHES" "lustre/lustre/kernel_patches" ; do
-	[ "$patchesdir" ] && \
-	    cp -v $patchesdir/kernel_configs/kernel-${VERSION}-${TARGET}*.config linux/configs/ >/dev/null && copysuccess=1
+        [ "$patchesdir" ] && \
+            cp -v $patchesdir/kernel_configs/kernel-${VERSION}-${TARGET}*.config linux/configs/ >/dev/null && copysuccess=1
     done
     [ "$copysuccess" = "1" ] || \
-	fatal 1 "Error copying in kernel configs."
+        fatal 1 "Error copying in kernel configs."
 }
 
 pack_linux()
@@ -409,9 +466,9 @@ pack_linux()
     TARBALL="$(readlink linux)-$EXTRA_VERSION.tar.gz"
     echo "Creating patched linux tarball $TARBALL..."
     tar zcf "$TARBALL" "$(readlink linux)" \
-	--exclude "CVS" --exclude ".cvsignore" || \
-	--exclude "*.orig" --exclude "*~" --exclude "*.rej" || \
-	fatal 1 "Error creating patched Linux tarball."
+        --exclude "CVS" --exclude ".cvsignore" || \
+        --exclude "*.orig" --exclude "*~" --exclude "*.rej" || \
+        fatal 1 "Error creating patched Linux tarball."
 }
 
 clean_linux()
@@ -427,42 +484,42 @@ prep_kernel_build()
     # make .spec file
     ENABLE_INIT_SCRIPTS=""
     sed \
-	-e "s^@BASE_ARCHS@^$BASE_ARCHS^g" \
-	-e "s^@BIGMEM_ARCHS@^$BIGMEM_ARCHS^g" \
-	-e "s^@BIGSMP_ARCHS@^$BIGSMP_ARCHS^g" \
-	-e "s^@BOOT_ARCHS@^$BOOT_ARCHS^g" \
-	-e "s^@CONFIGURE_FLAGS@^$CONFIGURE_FLAGS^g" \
-	-e "s^@ENABLE_INIT_SCRIPTS@^$ENABLE_INIT_SCRIPTS^g" \
-	-e "s^@JENSEN_ARCHS@^$BOOT_ARCHS^g" \
-	-e "s^@KERNEL_EXTRA_VERSION@^$EXTRA_VERSION^g" \
-	-e "s^@KERNEL_RELEASE@^${EXTRA_VERSION//-/_}^g" \
-	-e "s^@KERNEL_SOURCE@^$KERNEL^g" \
-	-e "s^@KERNEL_VERSION@^$VERSION^g" \
-	-e "s^@LINUX26@^$LINUX26^g" \
-	-e "s^@LUSTRE_SOURCE@^${LUSTRE##*/}^g" \
-	-e "s^@LUSTRE_TARGET@^$TARGET^g" \
-	-e "s^@PSERIES64_ARCHS@^$PSERIES64_ARCHS^g" \
-	-e "s^@RHBUILD@^$RHBUILD^g" \
-	-e "s^@SMP_ARCHS@^$SMP_ARCHS^g" \
-	-e "s^@SUSEBUILD@^$SUSEBUILD^g" \
-	-e "s^@SUSEBUILD@^$SUSEBUILD^g" \
-	-e "s^@UP_ARCHS@^$UP_ARCHS^g" \
-	< $TOPDIR/lustre/build/lustre-kernel-2.4.spec.in \
-	> lustre-kernel-2.4.spec
+        -e "s^@BASE_ARCHS@^$BASE_ARCHS^g" \
+        -e "s^@BIGMEM_ARCHS@^$BIGMEM_ARCHS^g" \
+        -e "s^@BIGSMP_ARCHS@^$BIGSMP_ARCHS^g" \
+        -e "s^@BOOT_ARCHS@^$BOOT_ARCHS^g" \
+        -e "s^@CONFIGURE_FLAGS@^$CONFIGURE_FLAGS^g" \
+        -e "s^@ENABLE_INIT_SCRIPTS@^$ENABLE_INIT_SCRIPTS^g" \
+        -e "s^@JENSEN_ARCHS@^$BOOT_ARCHS^g" \
+        -e "s^@KERNEL_EXTRA_VERSION@^$EXTRA_VERSION^g" \
+        -e "s^@KERNEL_RELEASE@^${EXTRA_VERSION//-/_}^g" \
+        -e "s^@KERNEL_SOURCE@^$KERNEL^g" \
+        -e "s^@KERNEL_VERSION@^$VERSION^g" \
+        -e "s^@LINUX26@^$LINUX26^g" \
+        -e "s^@LUSTRE_SOURCE@^${LUSTRE##*/}^g" \
+        -e "s^@LUSTRE_TARGET@^$TARGET^g" \
+        -e "s^@PSERIES64_ARCHS@^$PSERIES64_ARCHS^g" \
+        -e "s^@RHBUILD@^$RHBUILD^g" \
+        -e "s^@SMP_ARCHS@^$SMP_ARCHS^g" \
+        -e "s^@SUSEBUILD@^$SUSEBUILD^g" \
+        -e "s^@SUSEBUILD@^$SUSEBUILD^g" \
+        -e "s^@UP_ARCHS@^$UP_ARCHS^g" \
+        < $TOPDIR/lustre/build/lustre-kernel-2.4.spec.in \
+        > lustre-kernel-2.4.spec
     [ -d SRPMS ] || mkdir SRPMS
     [ -d RPMS ] || mkdir RPMS
     [ -d BUILD ] || mkdir BUILD
     [ -d SOURCES ] || mkdir SOURCES
     for script in linux-{rhconfig.h,merge-config.awk,merge-modules.awk} \
-	suse-{functions.sh,post.sh,postun.sh,trigger-script.sh.in} \
-	sles8-{pre,post,postun,update_{INITRD_MODULES,rcfile_setting}}.sh ; do
-	cp $TOPDIR/lustre/build/$script SOURCES
+        suse-{functions.sh,post.sh,postun.sh,trigger-script.sh.in} \
+        sles8-{pre,post,postun,update_{INITRD_MODULES,rcfile_setting}}.sh ; do
+        cp $TOPDIR/lustre/build/$script SOURCES
     done
     cp "$LUSTRE" "$KERNEL_FILE" SOURCES
     if [ "$EXTERNAL_PATCHES" -a -d "$EXTERNAL_PATCHES" ] ; then
-	tar zcf SOURCES/external-patches.tar.gz -C "$EXTERNAL_PATCHES" series targets patches kernel_configs
+        tar zcf SOURCES/external-patches.tar.gz -C "$EXTERNAL_PATCHES" series targets patches kernel_configs
     else
-	touch SOURCES/external-patches.tar.gz
+        touch SOURCES/external-patches.tar.gz
     fi
 }
 
@@ -479,17 +536,17 @@ build_kernel()
     echo "Building kernel + Lustre RPMs for: $BUILD_ARCHS..."
     targets=
     for arch in $BUILD_ARCHS ; do
-	targets="--target $arch $targets"
+        targets="--target $arch $targets"
     done
 
     $RPMBUILD $targets -bb lustre-kernel-2.4.spec \
-	--define "_topdir $TOPDIR" || \
-	fatal 1 "Error building rpms for $BUILD_ARCHS."
+        --define "_topdir $TOPDIR" || \
+        fatal 1 "Error building rpms for $BUILD_ARCHS."
 
     if (( $DO_SRC )) ; then
-	$RPMBUILD -bs lustre-kernel-2.4.spec \
-	    --define "_topdir $TOPDIR" || \
-	    fatal 1 "Error building .src.rpm."
+        $RPMBUILD -bs lustre-kernel-2.4.spec \
+            --define "_topdir $TOPDIR" || \
+            fatal 1 "Error building .src.rpm."
     fi
 }
 
@@ -507,26 +564,38 @@ build_lustre()
     echo "Building Lustre RPMs for: $BUILD_ARCHS..."
     targets=
     for arch in $BUILD_ARCHS ; do
-	targets="--target $arch $targets"
+        targets="--target $arch $targets"
     done
 
     ./configure "--with-linux=${LINUX}" ${CONFIGURE_FLAGS}
 
     $RPMBUILD $targets -bb build/lustre.spec \
-	--define "_topdir $TOPDIR" || \
-	fatal 1 "Error building rpms for $BUILD_ARCHS."
+        --define "_topdir $TOPDIR" || \
+        fatal 1 "Error building rpms for $BUILD_ARCHS."
 
     popd >/dev/null
 }
 
-publish()
+stage()
 {
-    publishing || return 0
+    [ "$STAGEDIR" ] || return 0
+
+    for arch in $BUILD_ARCHS ; do
+        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
+    done
+
+    cp -v "$LUSTRE" "$STAGEDIR"
 }
 
 [ -r ~/.lbuildrc ] && . ~/.lbuildrc
 
-options=$(getopt -o d:D:h -l disable-datestamp,external-patches:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,publish,release,tag:,target:,target-archs:,with-linux: -- "$@")
+options=$(getopt -o d:D:h -l disable-datestamp,external-patches:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,publish,release,stage:,tag:,target:,target-archs:,with-linux: -- "$@")
 
 if [ $? != 0 ] ; then
     usage 1
@@ -536,84 +605,87 @@ eval set -- "$options"
     
 while [ "$1" ] ; do
     case "$1" in
-	'')
-	    usage 1
-	    ;;
-	-d)
-	    CVSROOT=$2
-	    shift 2
-	    ;;
-	-D)
-	    DATE=$2
-	    shift 2
-	    ;;
-	--external-patches)
-	    EXTERNAL_PATCHES=$2
-	    shift 2
-	    ;;
-	--extraversion)
-	    EXTRA_VERSION=$2
-	    shift 2
-	    ;;
-	--help | -h)
-	    usage 0
-	    ;;
-	--kerneldir)
-	    KERNELDIR=$2
-	    shift 2
-	    ;;
-	--linux | --with-linux)
-	    LINUX=$2
-	    shift 2
-	    ;;
-	--lustre)
-	    LUSTRE=$2
-	    shift 2
-	    ;;
-	--nodownload)
-	    DOWNLOAD=0
-	    shift 1
-	    ;;
-	--nosrc)
-	    DO_SRC=0
-	    shift 1
-	    ;;
-	--publish)
-	    PUBLISH=1
-	    shift
-	    ;;
-	--release)
-	    RELEASE=1
-	    shift
-	    ;;
-	--src)
-	    DO_SRC=1
-	    shift 1
-	    ;;
-	--tag)
-	    TAG=$2
-	    shift 2
-	    ;;
-	--target)
-	    TARGET=$2
-	    shift 2
-	    ;;
-	--target-archs)
-	    TARGET_ARCHS=$2
-	    shift 2
-	    ;;
-	--disable-datestamp)
-	    USE_DATESTAMP=
-	    shift
-	    ;;
-	--)
-	    shift
-	    CONFIGURE_FLAGS=$@
-	    break
-	    ;; 
-	*)
-	    usage 1 "Unrecognized option: $1"
-	    ;;
+        '')
+            usage 1
+            ;;
+        -d)
+            CVSROOT=$2
+            shift 2
+            ;;
+        -D)
+            DATE=$2
+            shift 2
+            ;;
+        --external-patches)
+            EXTERNAL_PATCHES=$2
+            shift 2
+            ;;
+        --extraversion)
+            EXTRA_VERSION=$2
+            shift 2
+            ;;
+        --help | -h)
+            usage 0
+            ;;
+        --kerneldir)
+            KERNELDIR=$2
+            shift 2
+            ;;
+        --linux | --with-linux)
+            LINUX=$2
+            shift 2
+            ;;
+        --lustre)
+            LUSTRE=$2
+            shift 2
+            ;;
+        --nodownload)
+            DOWNLOAD=0
+            shift 1
+            ;;
+        --nosrc)
+            DO_SRC=0
+            shift 1
+            ;;
+        --publish)
+            shift
+            ;;
+        --release)
+            RELEASE=1
+            shift
+            ;;
+        --src)
+            DO_SRC=1
+            shift 1
+            ;;
+        --stage)
+            STAGEDIR=$2
+            shift 2
+            ;;
+        --tag)
+            TAG=$2
+            shift 2
+            ;;
+        --target)
+            TARGET=$2
+            shift 2
+            ;;
+        --target-archs)
+            TARGET_ARCHS=$2
+            shift 2
+            ;;
+        --disable-datestamp)
+            USE_DATESTAMP=
+            shift
+            ;;
+        --)
+            shift
+            CONFIGURE_FLAGS=$@
+            break
+            ;; 
+        *)
+            usage 1 "Unrecognized option: $1"
+            ;;
     esac
 done
 
@@ -625,19 +697,56 @@ unpack_lustre
 if [ -z "$LINUX" ] ; then
     load_target
 
-    if (( $DO_SRC )) ; then
-	unpack_linux
-	patch_linux
-	pack_linux
-	clean_linux
-    fi
+    if [ "$SERIES" ] ; then
+        if (( $DO_SRC )) ; then
+            unpack_linux
+            patch_linux
+            pack_linux
+            clean_linux
+        fi
 
-    prep_kernel_build
-    clean_lustre
+        prep_kernel_build
+        clean_lustre
 
-    build_kernel
+        build_kernel
+    else
+        # can't build a kernel if we have no series for it (i.e. patchless)
+        # but we still need the headers
+        use_unpacked_source=false
+        if $use_unpacked_source; then
+            unpack_linux
+            LINUX=$(pwd)/linux
+            pushd $LINUX && {
+                # need a .config -- like a user would do
+                BOOTCONFIG="/boot/config-${lnxmaj}-${lnxrel}smp"
+                if [ -f $BOOTCONFIG ]; then
+                    cp $BOOTCONFIG .config
+                else
+                    fatal 1 "$BOOTCONFIG doesn't exist!  Help!"                
+                fi
+                # vendors like to taint the EXTRAVERSION in their kernel-source
+                # to differentiate a user-built kernel from their own
+                ed << EOF Makefile
+/^EXTRAVERSION =/d
+wq
+EOF
+                make oldconfig
+                make include/asm
+                make include/linux/version.h
+                make SUBDIRS=scripts
+            }
+            popd
+        else
+            LINUX=/lib/modules/${lnxmaj}-${lnxrel}smp/build
+            if [ ! -e $LINUX ]; then
+                fatal 1 "$LINUX does not exist!  Install a kernel-devel package!"
+            fi
+        fi
+        CONFIGURE_FLAGS="CONFIGURE_FLAGS --disable-server"
+        build_lustre
+    fi
 else
     build_lustre
 fi
 
-publish
+stage