|
| From: | Andreas Färber |
| Subject: | Re: [Qemu-devel] [PATCH v2] win32: Fix CRLF problem in make_device_config.sh |
| Date: | Sat, 18 Dec 2010 18:09:41 +0100 |
Am 18.12.2010 um 17:34 schrieb Stefan Weil:
QEMU source code with CRLF line endings which is quite common on windows hosts fails with current make_device_config.sh. The awk script gets the name of the included file with \r, so instead of pci.mak it will search for pci.mak\r which of course does not work. Fix this by removing any \r. v2: Avoid using sub() and \r with awk because they are unsupported on some platforms. Use tr to remove \r. This new solution improves portability and was suggested by Paolo Bonzini. Signed-off-by: Stefan Weil <address@hidden>
Acked-by: Andreas Färber <address@hidden>
--- 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 8abadfe..596fc5b 100644 --- a/make_device_config.sh +++ b/make_device_config.sh @@ -18,7 +18,7 @@ process_includes () { f=$src while [ -n "$f" ] ; do - f=`awk '/^include / {ORS=" " ; print "'$src_dir'/" $2}' $f`+ f=`tr -d '\r' < $f | awk '/^include / {ORS=" "; print "'$src_dir'/" $2}'`[ $? = 0 ] || exit 1 all_includes="$all_includes $f" done -- 1.7.2.3
| [Prev in Thread] | Current Thread | [Next in Thread] |