Re: [Qemu-devel] [PATCH] make_device_config: Fix non-fatal error message with dash and other shells

[Andreas Färber]

Am 30.12.2010 um 23:04 schrieb Stefan Weil:

> 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 <address@hidden>
> Signed-off-by: Stefan Weil <address@hidden>

Tested-by: Andreas Färber <address@hidden>

`make defconfig; make` working fine on Mac OS X now!

Thanks,
Andreas

> ---
> 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
> --
> 1.7.2.3