[coreboot-gerrit] New patch to review for coreboot: util/abuild/abuild: Fix a few abuild errors

Martin Roth (martinroth@google.com) gerrit at coreboot.org
Tue Apr 19 04:31:44 CEST 2016


Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14410

-gerrit

commit 0d46f4b9de615fb750a6b81b117d89d5efec0372
Author: Martin Roth <martinroth at google.com>
Date:   Mon Apr 18 20:30:53 2016 -0600

    util/abuild/abuild: Fix a few abuild errors
    
    This file needs to be updated, but this should fix a few errors
    that we just saw:
    
    util/abuild/abuild: line 655: [:
    /home/coreboot/slave-root/workspace/coreboot-gerrit/
    src/mainboard/google/link: binary operator expected
    grep: kontron/come-bip2/Kconfig: No such file or directory
    
    util/abuild/abuild: line 313: [: /home/coreboot/slave-root/
    workspace/coreboot-gerrit/src/mainboard/google/link:0:
        integer expression expected
    
    util/abuild/abuild: line 318: [: src/mainboard/google/link:
    binary operator expected
    
    Change-Id: I0dbd9fa26e6250afe24800835ada236a0ee73e0a
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 util/abuild/abuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/abuild/abuild b/util/abuild/abuild
index a2a428b..817ee5e 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -310,12 +310,12 @@ function build_target
 
  	HOSTCC='gcc'
 
-	if [ $chromeos = true -a `grep -c "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig` -eq 0 ]; then
+	if [ -z "$(grep "^[[:space:]]*select[[:space:]]*MAINBOARD_HAS_CHROMEOS\>" ${ROOT}/src/mainboard/${board_srcdir}/Kconfig)" ]; then
 		echo "${MAINBOARD} doesn't support Chrome OS, skipping."
 		return
 	fi
 
-	if [ -f src/mainboard/${board_srcdir}/abuild.disabled ]; then
+	if [ -f "src/mainboard/${board_srcdir}/abuild.disabled" ]; then
 		echo "${MAINBOARD} disabled:"
 		cat src/mainboard/${board_srcdir}/abuild.disabled
 		return
@@ -652,7 +652,7 @@ if [ "$target" != "" ]; then
 	build_srcdir=$(mainboard_directory ${MAINBOARD})
 	if [ "$(echo ${MAINBOARD} | wc -w)" -gt 1 ]; then
 		build_targets ${MAINBOARD}
-	elif [ ! -r $ROOT/src/mainboard/${build_srcdir} ]; then
+	elif [ ! -r "$ROOT/src/mainboard/${build_srcdir}" ]; then
 		printf "No such target: ${MAINBOARD}\n"
 		exit 1
 	else



More information about the coreboot-gerrit mailing list