[coreboot-gerrit] New patch to review for coreboot: ffabc35 util/board_status/board_status.sh: Do not build `cbfstool`
Paul Menzel (paulepanter@users.sourceforge.net)
gerrit at coreboot.org
Sat Oct 18 14:51:27 CEST 2014
Paul Menzel (paulepanter at users.sourceforge.net) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7123
-gerrit
commit ffabc35e4cd13636496b91a63506c4ae31d152e5
Author: Paul Menzel <paulepanter at users.sourceforge.net>
Date: Sat Oct 18 14:37:41 2014 +0200
util/board_status/board_status.sh: Do not build `cbfstool`
Since commit b37ee1ee (util/board_status: use the right location of
cbfstool) [1] `board_status.sh` builds `cbfstool` if it is not found in
`build/cbfstool`. Currently this does not work, when the directory
`build/` does not exist.
The more important problem is, that the script `board_status.sh` is
normally run as root. This causes root to run `make -C util/cbfstool/`
causing problems later on, when the user with normal rights wants to
build coreboot and `build/cbfstool` needs to be overriden or when the
user wants to build cbfstool in `util/cbfstool`.
So the only reasonable thing to do is to error out in case the utility
is not found and let the user resolve it.
[1] http://review.coreboot.org/6299
Change-Id: I4c4a285bf4d08c48e59030fd476c3a7e5c3678e6
Signed-off-by: Paul Menzel <paulepanter at users.sourceforge.net>
---
util/board_status/board_status.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh
index 49d2c73..f6e10ff 100755
--- a/util/board_status/board_status.sh
+++ b/util/board_status/board_status.sh
@@ -216,9 +216,6 @@ tmpdir=$(mktemp -d --tmpdir coreboot_board_status.XXXXXXXX)
# Obtain board and revision info to form the directory structure:
# <vendor>/<board>/<revision>/<timestamp>
cbfstool_cmd="build/cbfstool"
-if test ! -x build/cbfstool; then
- make -C util/cbfstool/ && cp util/cbfstool/cbfstool build/cbfstool
-fi
test_cmd $LOCAL "$cbfstool_cmd"
$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt
$cbfstool_cmd build/coreboot.rom print > ${tmpdir}/cbfs.txt
More information about the coreboot-gerrit
mailing list