Patchwork [2/4] fix scripts/make_device_config.sh

login
register
mail settings
Submitter Gerd Hoffmann
Date Feb. 1, 2013, noon
Message ID <1359720044-8140-3-git-send-email-kraxel@redhat.com>
Download mbox | patch
Permalink /patch/217441/
State New
Headers show

Comments

Gerd Hoffmann - Feb. 1, 2013, noon
Make it handle multiple include statements in a file.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 scripts/make_device_config.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Andreas Färber - Feb. 1, 2013, 1:38 p.m.
Am 01.02.2013 13:00, schrieb Gerd Hoffmann:
> Make it handle multiple include statements in a file.
> 
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  scripts/make_device_config.sh |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> index 0778fe2..81fe942 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

The actual fix is appending a space? Or how does cat make a difference?

Cheers,
Andreas
Gerd Hoffmann - Feb. 1, 2013, 3:18 p.m.
On 02/01/13 14:38, Andreas Färber wrote:
> Am 01.02.2013 13:00, schrieb Gerd Hoffmann:
>> Make it handle multiple include statements in a file.
>>
>> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
>> ---
>>  scripts/make_device_config.sh |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
>> index 0778fe2..81fe942 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
> 
> The actual fix is appending a space? Or how does cat make a difference?

Both changes are needed.

Without the space you get "pci.makusb.mak" instead of "pci.mak usb.mak"
in $f (and $all_includes).

The cat makes sure it still works with two files in $f.

cheers,
  Gerd

Patch

diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 0778fe2..81fe942 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