b=12348

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

diff --git a/build/lbuild b/build/lbuild
index e643ee2..41ffe3f 100755 (executable)
--- a/build/lbuild
+++ b/build/lbuild
@@ -83,12 +83,9 @@ is_release()
 
 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}"
+    for target in $TOPDIR/lustre/kernel_patches/targets/*.target.in ; do
+        echo -n "$(basename $target .target.in) "
     done
-    echo
 }
 
 usage()
@@ -147,9 +144,9 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
     A CVS branch/tag name to build from when pulling from CVS.
 
   --target=TARGET
-    The name of the target to build.  The available targets are listed
-    below.
-
+    The name of the target to build.  
+    One of: $(list_targets)
+    
   --target-archs=TARGET_ARCHS
     A (space delimited) list of architectures to build.  By default,
     all of the archs supported by the TARGET will be built, in
@@ -167,8 +164,6 @@ Usage: ${0##*/} [OPTION]... [-- <lustre configure options>]
 
 EOF
 
-#   list_targets
-
     fatal "$1" "$2"
 }
 
@@ -209,6 +204,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"
             ;;
@@ -577,7 +575,7 @@ build_lustre()
 
     ./configure "--with-linux=${LINUX}" ${CONFIGURE_FLAGS}
 
-    $RPMBUILD $targets -bb build/lustre.spec \
+    $RPMBUILD $targets -bb lustre.spec \
         --define "_tmppath $TMPDIR" \
         --define "_topdir $TOPDIR" || \
         fatal 1 "Error building rpms for $BUILD_ARCHS."
@@ -604,7 +602,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