Branch HEAD

[fs/lustre-release.git] / build / lbuild

diff --git a/build/lbuild b/build/lbuild
index cfdc8a0..7e9c630 100755 (executable)
--- a/build/lbuild
+++ b/build/lbuild
@@ -209,6 +209,9 @@ check_options()
         2.6-suse)
             CANONICAL_TARGET="sles-2.6"
             ;;
+        2.6-sles10)
+            CANONICAL_TARGET="sles10-2.6"
+            ;;
         hp_pnnl-2.4)
             CANONICAL_TARGET="hp-pnnl-2.4"
             ;;
@@ -546,13 +549,13 @@ build_kernel()
     done
 
     $RPMBUILD $targets -bb lustre-kernel-2.4.spec \
-        --define "_tmpdir $TMPDIR" \
+        --define "_tmppath $TMPDIR" \
         --define "_topdir $TOPDIR" || \
         fatal 1 "Error building rpms for $BUILD_ARCHS."
 
     if (( $DO_SRC )) ; then
         $RPMBUILD -bs lustre-kernel-2.4.spec \
-            --define "_tmpdir $TMPDIR" \
+            --define "_tmppath $TMPDIR" \
             --define "_topdir $TOPDIR" || \
             fatal 1 "Error building .src.rpm."
     fi
@@ -577,8 +580,8 @@ build_lustre()
 
     ./configure "--with-linux=${LINUX}" ${CONFIGURE_FLAGS}
 
-    $RPMBUILD $targets -bb build/lustre.spec \
-        --define "_tmpdir $TMPDIR" \
+    $RPMBUILD $targets -bb lustre.spec \
+        --define "_tmppath $TMPDIR" \
         --define "_topdir $TOPDIR" || \
         fatal 1 "Error building rpms for $BUILD_ARCHS."
 
@@ -604,7 +607,7 @@ stage()
 
 [ -r ~/.lbuildrc ] && . ~/.lbuildrc
 
-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: -- "$@")
+options=$(getopt -o d:D:h -l disable-datestamp,external-patches:,extraversion:,kerneldir:,linux:,lustre:,nodownload,nosrc,publish,release,src,stage:,tag:,target:,target-archs:,with-linux: -- "$@")
 
 if [ $? != 0 ] ; then
     usage 1