From 5a4b26958471fc30137f840627c774703b8afd43 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Sat, 6 Jun 2015 22:53:37 +0200
Subject: reproducible coreboot: also build for mips, arm, arm64 and riscv. Fix
 up parallel build.

---
 TODO                         |  1 -
 bin/reproducible_coreboot.sh | 11 ++++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/TODO b/TODO
index 3e0d8f70..012b150e 100644
--- a/TODO
+++ b/TODO
@@ -227,7 +227,6 @@ egrep -R -l '(debbindiff had trouble comparing|maybe there is still )' /var/lib/
 
 * coreboot build job
 ** add more variations
-** add more archs: mips, arm, arm64, riscv
 ** clone with https
 * coreboot html
 ** include rom name via path in dbd output
diff --git a/bin/reproducible_coreboot.sh b/bin/reproducible_coreboot.sh
index 7719052e..9848ffe6 100755
--- a/bin/reproducible_coreboot.sh
+++ b/bin/reproducible_coreboot.sh
@@ -13,10 +13,10 @@ common_init "$@"
 
 set -e
 
-# support for different architectures (we start with i386 only)
-ARCHS="i386"
+# build for different architectures
+ARCHS="i386 mips arm arm64 riscv"
 
-cleanup_all() {
+cleanup_tmpdir() {
 	cd
 	rm -r $TMPDIR
 }
@@ -80,7 +80,7 @@ call_debbindiff() {
 #
 
 TMPDIR=$(mktemp --tmpdir=/srv/reproducible-results -d)  # where everything actually happens
-trap cleanup_all INT TERM EXIT
+trap cleanup_tmpdir INT TERM EXIT
 cd $TMPDIR
 
 DATE=$(date -u +'%Y-%m-%d %H:%M')
@@ -113,6 +113,7 @@ sed -i 's#MAKE=$i#MAKE=make#' util/abuild/abuild
 # use all cores for first build
 NUM_CPU=$(cat /proc/cpuinfo |grep ^processor|wc -l)
 sed -i "s#cpus=1#cpus=$NUM_CPU#" util/abuild/abuild
+sed -i 's#USE_XARGS=1#USE_XARGS=0#g' util/abuild/abuild
 # actually build everything
 bash util/abuild/abuild || true # don't fail the full job just because some targets fail
 
@@ -220,5 +221,5 @@ irc_message "$REPRODUCIBLE_URL/coreboot/ has been updated."
 
 # remove coreboot tree, we don't need it anymore...
 rm coreboot -r
-cleanup_all
+cleanup_tmpdir
 trap - INT TERM EXIT
-- 
cgit v1.2.3-70-g09d2