merge branch xo-strawberry with mainline

1 files changed, 25 insertions, 2 deletions

diff --git a/build b/build
index c99a9dc..7351332 100755
--- a/build
+++ b/build
@@ -1,7 +1,30 @@
 #!/bin/bash
 
 set -e
-set -o pipefail
 
-python live.py
+pushd images
+
+prevbuild=$(<lastbuild)
+buildstem=$(python -c "print '$prevbuild'.split('.')[0][:-2];")
+nextbuild=$(python -c "print '%0.2d' % (int('$prevbuild'.split('.')[0][-2:]) + 1);")
+buildname=$buildstem$nextbuild
+
+date ; date >> ${buildname}.buildlog
+echo building $buildname ; echo building $buildname >> ${buildname}.buildlog
+/usr/bin/time nice setarch i586 \
+    make -j 3 -f ../Makefile ${buildname}.done >> ${buildname}.buildlog 2>&1
+
+for ext in tree removable.img img ; do 
+    prevsize=$(< $prevbuild.$ext.size.txt)
+    nextsize=$(< $buildname.$ext.size.txt)
+    python -c "oldk = $prevsize ; newk = $nextsize ; print '%0.2fM / %dK /' % (newk / 1024.0, newk - oldk)" > $buildname.$ext.size-change.txt
+done
+
+diff -U 1 $prevbuild.tree.packages.txt $buildname.tree.packages.txt | grep -v ^@@ > $buildname.tree.package-changes.txt
+
+echo $buildname > lastbuild
+date ; date >> ${buildname}.buildlog
+
+popd
+
 python appliance.py