From 5d6b423c5cd6f9dfac30959ff1d5c088996719c3 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Sat, 18 Dec 2010 17:34:26 +0100 Subject: [PATCH] win32: Fix CRLF problem in make_device_config.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Acked-by: Andreas Färber Signed-off-by: Blue Swirl --- 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 8abadfef7c..596fc5bf69 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