From 0601740a5db12ea7ae0f2f7826f0cfb05854500a Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 30 Dec 2010 12:04:57 +0000 Subject: [PATCH] make_device_config: Fix non-fatal error message with dash and other shells MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ORS=" " adds a blank to the name of the include file. Some shells (e.g. dash) don't accept input redirection (tr -d '\r' < $f) when $f ends with a blank, so they print an error message instead of reading pci.mak. This is a non-fatal error because pci.mak does not contain an include line. It was introduced by commit 5d6b423c5cd6f9dfac30959ff1d5c088996719c3. Using printf avoids adding a blank and is also supported by older awk versions (this solution was suggested by Paolo Bonzini, thank you). Cc: Blue Swirl Signed-off-by: Stefan Weil Tested-by: Andreas Färber --- make_device_config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make_device_config.sh b/make_device_config.sh index 596fc5bf6..5d14885df 100644 --- a/make_device_config.sh +++ b/make_device_config.sh @@ -18,7 +18,7 @@ process_includes () { f=$src while [ -n "$f" ] ; do - f=`tr -d '\r' < $f | awk '/^include / {ORS=" "; print "'$src_dir'/" $2}'` + f=`tr -d '\r' < $f | awk '/^include / {printf "'$src_dir'/%s", $2}'` [ $? = 0 ] || exit 1 all_includes="$all_includes $f" done