# HG changeset patch
# User Rob Landley <rob@landley.net>
# Date 1268909087 18000
# Node ID 6d3db5bf731a78d98b6ead0b6f8f2af772f22311
# Parent  a835d605cb85a6ef35962438bfda0c1b2f728bbe
Make the native build timeout configurable.

diff -r a835d605cb85 -r 6d3db5bf731a sources/more/buildall.sh
--- a/sources/more/buildall.sh	Thu Mar 18 02:25:11 2010 -0500
+++ b/sources/more/buildall.sh	Thu Mar 18 05:44:47 2010 -0500
@@ -72,7 +72,7 @@
 mkdir -p build/native-static &&
 for i in ${ARCHES}
 do
-  maybe_fork "sources/more/native-build.sh $i build/host-temp/hdc.sqf build/native-static | tee build/logs/native-$i.txt | maybe_quiet"
+  maybe_fork "sources/more/native-build.sh $i build/host-temp/hdc.sqf build/native-static 60 | tee build/logs/native-$i.txt | maybe_quiet"
 done
 
 wait
diff -r a835d605cb85 -r 6d3db5bf731a sources/more/native-build.sh
--- a/sources/more/native-build.sh	Thu Mar 18 02:25:11 2010 -0500
+++ b/sources/more/native-build.sh	Thu Mar 18 05:44:47 2010 -0500
@@ -10,9 +10,9 @@
 
 # Parse arguments
 
-if [ $# -ne 3 ]
+if [ $# -lt 3 ]
 then
-  echo "usage: $0 ARCH HDCFILE OUTPUTDIR" >&2
+  echo "usage: $0 ARCH HDCFILE OUTPUTDIR [TIMEOUT_SECONDS]" >&2
   exit 1
 fi
 
@@ -26,6 +26,8 @@
 mkdir -p "$3" || dienow
 STAGE_DIR="$(readlink -f $3)"
 
+[ ! -z "$4" ] && DO_TIMEOUT="sources/timeout.sh $4"
+
 # Fire off the ftp daemon, making sure it's killed when this script exits
 
 . sources/toys/unique-port.sh || exit 1
@@ -41,6 +43,6 @@
 
 rm -f sources/system-image-"$ARCH"/hdb.img
 HDC="$HDCFILE" KERNEL_EXTRA="OUTPORT=$PORT ARCH=$ARCH" \
-  sources/timeout.sh 60 ./run-from-build.sh "$ARCH"
+   $DO_TIMEOUT ./run-from-build.sh "$ARCH"
 
 echo === End native build for $ARCH