diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2010-12-30 12:04:57 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-01-14 22:00:07 +0000 |
| commit | 0601740a5db12ea7ae0f2f7826f0cfb05854500a (patch) | |
| tree | 37217ac9e859fe7698025fd7d69dcb1d40218367 | |
| parent | 42f5a7e9367c1f2cadea3b5af8cccc2781c442df (diff) | |
| download | qemu-0601740a5db12ea7ae0f2f7826f0cfb05854500a.zip qemu-0601740a5db12ea7ae0f2f7826f0cfb05854500a.tar.gz qemu-0601740a5db12ea7ae0f2f7826f0cfb05854500a.tar.bz2 | |
make_device_config: Fix non-fatal error message with dash and other shells
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 <blauwirbel@gmail.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Tested-by: Andreas Färber <andreas.faerber@web.de>
| -rw-r--r-- | make_device_config.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/make_device_config.sh b/make_device_config.sh index 596fc5b..5d14885 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 |