summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2015-08-13 07:57:26 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-08-13 08:30:36 +0200
commitaa7dcef49427bde74ae4ddb48f6ed9823661a4a5 (patch)
tree84c06999aff7995c22a1e66c0d70e34020887b31
parent608f9b5b165c141efd4cb51fbecaa846e28b7992 (diff)
board-status: move board status back to $TMPDIR
Change-Id: I05a8c246384abfc954cfcf163a68cca71aa6b2f0 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/11224 Tested-by: build bot (Jenkins) Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
-rwxr-xr-xutil/board_status/board_status.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 14d6514e5b..ee27bc06fa 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -211,7 +211,8 @@ fi
# Results will be placed in a temporary location until we're ready to upload.
# If the user does not wish to upload, results will remain in /tmp.
-tmpdir=$(mktemp -d coreboot_board_status.XXXXXXXX)
+tmpdir=$(mktemp -d --tmpdir coreboot_board_status.XXXXXXXX)
+tmpcfg=$(mktemp coreboot_config.XXXXXX)
cbfstool_cmd="build/cbfstool"
if test ! -x build/cbfstool; then
@@ -219,8 +220,11 @@ if test ! -x build/cbfstool; then
fi
test_cmd $LOCAL "$cbfstool_cmd"
$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt
-cp ${tmpdir}/config.txt ${tmpdir}/config.short.txt
-yes "" | make DOTCONFIG=${tmpdir}/config.txt oldconfig
+mv ${tmpdir}/config.txt ${tmpdir}/config.short.txt
+cp ${tmpdir}/config.short.txt ${tmpcfg}
+yes "" | make DOTCONFIG=${tmpcfg} oldconfig 2>/dev/null >/dev/null
+mv ${tmpcfg} ${tmpdir}/config.txt
+rm -f ${tmpcfg}.old
$cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt
# Obtain board and revision info to form the directory structure: