aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-02-01 10:48:34 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-02-19 11:53:49 +0100
commitf4ece4046344230a3a030ef1e494599eaf0a5935 (patch)
tree6cf1b74105e3bce62b4598eff1a4dfdbdf04efcc
parent62162fff598f941c198b16b4e8814015ec5a0bef (diff)
downloadqemu-arm-f4ece4046344230a3a030ef1e494599eaf0a5935.tar.gz
fix scripts/make_device_config.sh
Make it handle multiple include statements in a file: (1) The printf needs a space so the include files will be separated. (2) Also $f can contain multiple failes, so redirection will not work and we have to use cat to process all files. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--scripts/make_device_config.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 0778fe2a42..81fe94259d 100644
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -18,7 +18,7 @@ process_includes () {
f=$src
while [ -n "$f" ] ; do
- f=`tr -d '\r' < $f | awk '/^include / {printf "'$src_dir'/%s", $2}'`
+ f=`cat $f | tr -d '\r' | awk '/^include / {printf "'$src_dir'/%s ", $2}'`
[ $? = 0 ] || exit 1
all_includes="$all_includes $f"
done