[01/11] fix 'no such file' error from make_device_config.sh

Submitted by David S. Ahern on Jan. 14, 2011, 7:12 p.m.

Details

Message ID 1295032341-6926-2-git-send-email-daahern@cisco.com
State New
Headers show

Commit Message

David S. Ahern Jan. 14, 2011, 7:12 p.m.
make_device_config currently emits an error:

make config-all-devices.mak
  GEN   x86_64-softmmu/config-devices.mak
/home/dsa/kvm/releases/qemu.git/make_device_config.sh: line 21: /home/dsa/kvm/releases/qe

Root cause is a space in the filename (determined by Markus Armbruster). Change from Markus Armbruster <armbru@redhat.com>.

Signed-off-by: David Ahern <daahern@cisco.com>
---
 make_device_config.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Stefan Weil Jan. 14, 2011, 9:04 p.m.
Am 14.01.2011 20:12, schrieb David Ahern:
> make_device_config currently emits an error:
>
> make config-all-devices.mak
>    GEN   x86_64-softmmu/config-devices.mak
> /home/dsa/kvm/releases/qemu.git/make_device_config.sh: line 21: /home/dsa/kvm/releases/qe
>
> Root cause is a space in the filename (determined by Markus Armbruster). Change from Markus Armbruster<armbru@redhat.com>.
>
> Signed-off-by: David Ahern<daahern@cisco.com>
> ---
>   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..711829c 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 / {print "'$src_dir'/" $2}'`
>     [ $? = 0 ] || exit 1
>     all_includes="$all_includes $f"
>   done
>    


See http://patchwork.ozlabs.org/patch/77021/
David S. Ahern Jan. 14, 2011, 9:16 p.m.
On 01/14/11 14:04, Stefan Weil wrote:
> Am 14.01.2011 20:12, schrieb David Ahern:
>> make_device_config currently emits an error:
>>
>> make config-all-devices.mak
>>    GEN   x86_64-softmmu/config-devices.mak
>> /home/dsa/kvm/releases/qemu.git/make_device_config.sh: line 21:
>> /home/dsa/kvm/releases/qe
>>
>> Root cause is a space in the filename (determined by Markus
>> Armbruster). Change from Markus Armbruster<armbru@redhat.com>.
>>
>> Signed-off-by: David Ahern<daahern@cisco.com>
>> ---
>>   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..711829c 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 / {print "'$src_dir'/" $2}'`
>>     [ $? = 0 ] || exit 1
>>     all_includes="$all_includes $f"
>>   done
>>    
> 
> 
> See http://patchwork.ozlabs.org/patch/77021/
> 

Yet another patch lost to the black hole....
Paolo Bonzini Jan. 15, 2011, 3:42 p.m.
On 01/14/2011 08:12 PM, David Ahern wrote:
> make_device_config currently emits an error:
>
> make config-all-devices.mak
>    GEN   x86_64-softmmu/config-devices.mak
> /home/dsa/kvm/releases/qemu.git/make_device_config.sh: line 21: /home/dsa/kvm/releases/qe
>
> Root cause is a space in the filename (determined by Markus Armbruster). Change from Markus Armbruster<armbru@redhat.com>.
>
> Signed-off-by: David Ahern<daahern@cisco.com>
> ---
>   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..711829c 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 / {print "'$src_dir'/" $2}'`

Can anybody with Windows test this to make sure there are no CR woes? 
That was IIRC the reason for the strange ORS setting.

If there are, we can just change it to this:

   f=`tr -d '\r'<"$f" | awk '/^include / {printf "'$src_dir'/%s", $2}'`

Sorry for not noticing this in the previous thread.

Paolo

Patch hide | download patch | download mbox

diff --git a/make_device_config.sh b/make_device_config.sh
index 596fc5b..711829c 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 / {print "'$src_dir'/" $2}'`
   [ $? = 0 ] || exit 1
   all_includes="$all_includes $f"
 done