changeset 33:a051c841d782

Add command recording ability (via record-commands wrapper).
author Rob Landley <rob@landley.net>
date Fri, 22 Mar 2013 22:54:03 -0500
parents 676e1b843ee4
children 63663cdfbe32
files common/bootstrap/build-one-package.sh common/bootstrap/run-build-stages.sh
diffstat 2 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/bootstrap/build-one-package.sh	Thu Nov 01 16:57:15 2012 -0500
+++ b/common/bootstrap/build-one-package.sh	Fri Mar 22 22:54:03 2013 -0500
@@ -36,7 +36,7 @@
 
   for guess in $(find . -name config.guess)
   do
-    rm "$guess" &&
+    rm -f "$guess" &&
     echo -e "#!/bin/sh\ngcc -dumpmachine" > "$guess" || exit 1
   done
   EXT=sh
@@ -47,7 +47,7 @@
 # Call package build script
 
 mkdir -p /home/log
-time "/mnt/build/$1".* 2>&1 | tee "/home/log/$1.log"
+WRAPPY_LOGPATH=/home/log/$1.commands time $RECORD_COMMANDS "/mnt/build/$1".* 2>&1 | tee "/home/log/$1.log"
 if [ $? -ne 0 ]
 then
   echo "$1" died >&2
--- a/common/bootstrap/run-build-stages.sh	Thu Nov 01 16:57:15 2012 -0500
+++ b/common/bootstrap/run-build-stages.sh	Fri Mar 22 22:54:03 2013 -0500
@@ -17,6 +17,17 @@
     echo "$i already installed"
     continue
   fi
+  if [ ! -z "$RECORD" ]
+  then
+    [ "${RECORD:0:1}" != "," ] && RECORD=",$RECORD"
+    if [ "$RECORD" == ,all ] || [ "$RECORD" != "${RECORD/,$i/}" ]
+    then
+      echo recording commands for $i
+      export RECORD_COMMANDS=record-commands
+    else
+      RECORD_COMMANDS=
+    fi
+  fi
   X_OF_Y="($X of $PACKAGECOUNT)" /mnt/build-one-package.sh "$i" || exit 1
   
   sed -i -e "/$i/d" "$MANIFEST" &&