changeset 1579:bd385934451f

Only precreate hdb/home image for each target when FORK set.
author Rob Landley <rob@landley.net>
date Thu, 10 Jan 2013 02:49:32 -0600
parents fcf026742d92
children 455f8dec31a0
files more/buildall-native.sh
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/more/buildall-native.sh	Thu Jan 10 01:31:29 2013 -0600
+++ b/more/buildall-native.sh	Thu Jan 10 02:49:32 2013 -0600
@@ -21,17 +21,16 @@
 # Build the hdb images sequentially without timeout.sh, to avoid potential
 # I/O storm triggering timeouts
 
-FORK= more/for-each-target.sh \
+[ ! -z "$FORK" ] && FORK= more/for-each-target.sh \
   '. sources/toys/make-hdb.sh; HDBMEGS=2048; HDB=build/system-image-$TARGET/hdb.img; echo "$HDB"; rm -f "$HDB"; make_hdb'
 
 # Put each control image's output in the build directory
 
 mkdir -p build/logs || dienow
-more/for-each-target.sh 'ln -sf .. build/system-image-$TARGET/upload'
 
 # Run a control image for each target, using existing hdb.img
 
 [ -z "$TIMEOUT" ] && export TIMEOUT=60
 [ -z "$LOGFILE" ] && LOGFILE="$(echo $1 | sed 's@.*/\(.*\)\.hdc@\1@')"
 more/for-each-target.sh \
-  'more/timeout.sh $TIMEOUT "HDB=hdb.img more/native-build-from-build.sh $TARGET '"$1 | tee build/logs/native-$LOGFILE-"'$TARGET.txt"'
+  'ln -sfn .. build/system-image-$TARGET/upload && more/timeout.sh $TIMEOUT "HDB=hdb.img more/native-build-from-build.sh $TARGET '"$1 | tee build/logs/native-$LOGFILE-"'$TARGET.txt"'