aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-12-18 17:34:26 +0100
committerBlue Swirl <blauwirbel@gmail.com>2010-12-18 18:58:25 +0000
commit5d6b423c5cd6f9dfac30959ff1d5c088996719c3 (patch)
treec610138b988fedcd780feb56310498fe3af37cae
parent86d1c3887f8665204e2c7454003ac71a6a52e806 (diff)
downloadqemu-5d6b423c5cd6f9dfac30959ff1d5c088996719c3.zip
qemu-5d6b423c5cd6f9dfac30959ff1d5c088996719c3.tar.gz
qemu-5d6b423c5cd6f9dfac30959ff1d5c088996719c3.tar.bz2
win32: Fix CRLF problem in make_device_config.sh
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 <weil@mail.berlios.de> Acked-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--make_device_config.sh2
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