[coreboot-gerrit] Change in coreboot[master]: abuild: give --silent the silent treatment

Patrick Georgi (Code Review) gerrit at coreboot.org
Tue Jun 27 14:03:27 CEST 2017


Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/20390


Change subject: abuild: give --silent the silent treatment
......................................................................

abuild: give --silent the silent treatment

It's obsolete and without effect.

Change-Id: I17c1f8bffc2048a79de58cdc2a70651796db6ba6
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
---
M util/abuild/abuild
1 file changed, 8 insertions(+), 11 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/90/20390/1

diff --git a/util/abuild/abuild b/util/abuild/abuild
index 6473fcf..d988164 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -75,10 +75,6 @@
 # this can be changed to junit by -J
 mode=text
 
-# silent mode.. no compiler calls, only warnings in the log files.
-# this is disabled per default but can be enabled with -s
-silent=
-
 # quiet mode: only print pass, failure, and 'skipped' messages
 quiet=false
 
@@ -274,10 +270,10 @@
 	# shellcheck disable=SC2059
 	printf "$configoptions" >> "${config_file}"
 
-	yes "" 2>/dev/null | $MAKE oldconfig $silent "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" ; \
+	yes "" 2>/dev/null | $MAKE oldconfig $verboseopt "DOTCONFIG=${config_file}" "obj=${build_dir}" "objutil=$TARGET/sharedutils" &> "${build_dir}/config.log" ; \
 		CONFIG_OK=$?
 	if [ $CONFIG_OK -eq 0 ]; then
-		$MAKE savedefconfig $silent DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &>> "${build_dir}/config.log"
+		$MAKE savedefconfig $verboseopt DEFCONFIG="${defconfig_file}" DOTCONFIG="${config_file}" obj="${build_dir}" objutil="$TARGET/sharedutils" &>> "${build_dir}/config.log"
 		return $?
 	else
 		return 1
@@ -344,8 +340,7 @@
 
 	CURR=$( pwd )
 	#stime=`perl -e 'print time();' 2>/dev/null || date +%s`
-	# shellcheck disable=SC2086
-	eval $BUILDPREFIX $MAKE $silent DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" BUILD_TIMELESS=$TIMELESS \
+	eval $BUILDPREFIX $MAKE $verboseopt DOTCONFIG="${build_dir}/config.build" obj="${build_dir}" objutil="$TARGET/sharedutils" BUILD_TIMELESS=$TIMELESS \
 		&> "${build_dir}/make.log" ; \
 		MAKE_FAILED=$?
 	cp .xcompile "${build_dir}/xcompile.build"
@@ -547,7 +542,6 @@
     [-R|--root <path>]            Absolute path to coreboot sources
                                   (defaults to $ROOT)
     [--scan-build]                Use clang's static analyzer
-    [-s|--silent]                 Omit compiler calls in logs
     [--timeless]                  Generate timeless builds
     [-t|--target <vendor/board>]  Attempt to build target vendor/board only
     [-T|--test]                   Submit image(s) to automated test system
@@ -563,6 +557,7 @@
     [-V|--version]                Print version number and exit
     [-h|--help]                   Print this help and exit
 
+    [-s|--silent]                 obsolete
 __END_OF_HELP
 }
 
@@ -621,6 +616,7 @@
 
 chromeos=false
 clean_work=false
+verboseopt='V=0'
 customizing=""
 configoptions=""
 # testclass needs to be undefined if not used for variable expansion to work
@@ -632,7 +628,7 @@
 		-a|--all)	shift; buildall=true;;
 		-d|--dir)	shift; configdir="$1"; shift;;
 		-r|--remove)	shift; remove=true;;
-		-v|--verbose)	shift; verbose=true; silent='V=1';;
+		-v|--verbose)	shift; verbose=true; verboseopt='V=1';;
 		-q|--quiet)	shift; quiet=true;;
 		-V|--version)	shift; myversion; exit 0;;
 		-h|--help)	shift; myversion; myhelp; exit 0;;
@@ -645,7 +641,8 @@
 			test "$1" == "1" && cpuconfig=" on 1 cpu"
 			expr "$1" : '-\?[0-9]\+$' > /dev/null && test "0$1" -gt 1 && cpuconfig=" on $1 cpus in parallel"
 			shift;;
-		-s|--silent)    shift; silent="-s";;
+		# obsolete option
+		-s|--silent)    shift;;
 		--scan-build)   shift
 			scanbuild=true
 			customizing="${customizing}, scan-build"

-- 
To view, visit https://review.coreboot.org/20390
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17c1f8bffc2048a79de58cdc2a70651796db6ba6
Gerrit-Change-Number: 20390
Gerrit-PatchSet: 1
Gerrit-Owner: Patrick Georgi <pgeorgi at google.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170627/cb56fcae/attachment.html>


More information about the coreboot-gerrit mailing list