Patchwork make_device_config.sh: Fix target path in generated dependency file

login
register
mail settings
Submitter Andreas Färber
Date June 7, 2012, 4:23 p.m.
Message ID <1339086183-1356-1-git-send-email-afaerber@suse.de>
Download mbox | patch
Permalink /patch/163647/
State New
Headers show

Comments

Andreas Färber - June 7, 2012, 4:23 p.m.
config-devices.mak.d is included from Makefile.target, i.e. from inside
the *-softmmu/ directory. It included the directory path, so never
applied to the actual config-devices.mak. Symptoms were spurious
dependency issues with default-configs/pci.mak.

Fix by using `basename` to strip the directory path.

Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 Seems I forgot to send this out before 1.1...

 scripts/make_device_config.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Michael Tokarev - Sept. 18, 2012, 12:29 p.m.
Has it been applied to anything?  I don't think so.
Is it still needed?

Thanks,

/mjt

On 07.06.2012 20:23, Andreas Färber wrote:
> config-devices.mak.d is included from Makefile.target, i.e. from inside
> the *-softmmu/ directory. It included the directory path, so never
> applied to the actual config-devices.mak. Symptoms were spurious
> dependency issues with default-configs/pci.mak.
> 
> Fix by using `basename` to strip the directory path.
> 
> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
> Signed-off-by: Andreas Färber <afaerber@suse.de>
> ---
>  Seems I forgot to send this out before 1.1...
> 
>  scripts/make_device_config.sh |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> index 5d14885..0778fe2 100644
> --- a/scripts/make_device_config.sh
> +++ b/scripts/make_device_config.sh
> @@ -25,4 +25,4 @@ done
>  process_includes $src > $dest
>  
>  cat $src $all_includes | grep -v '^include' > $dest
> -echo "$1: $all_includes" > $dep
> +echo "`basename $1`: $all_includes" > $dep
Andreas Färber - Sept. 18, 2012, 2:32 p.m.
Am 18.09.2012 14:29, schrieb Michael Tokarev:
> Has it been applied to anything?  I don't think so.
> Is it still needed?

Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.

/-F

> 
> Thanks,
> 
> /mjt
> 
> On 07.06.2012 20:23, Andreas Färber wrote:
>> config-devices.mak.d is included from Makefile.target, i.e. from inside
>> the *-softmmu/ directory. It included the directory path, so never
>> applied to the actual config-devices.mak. Symptoms were spurious
>> dependency issues with default-configs/pci.mak.
>>
>> Fix by using `basename` to strip the directory path.
>>
>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>> ---
>>  Seems I forgot to send this out before 1.1...
>>
>>  scripts/make_device_config.sh |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
>> index 5d14885..0778fe2 100644
>> --- a/scripts/make_device_config.sh
>> +++ b/scripts/make_device_config.sh
>> @@ -25,4 +25,4 @@ done
>>  process_includes $src > $dest
>>  
>>  cat $src $all_includes | grep -v '^include' > $dest
>> -echo "$1: $all_includes" > $dep
>> +echo "`basename $1`: $all_includes" > $dep
>
Michael Tokarev - Oct. 27, 2012, 8:32 a.m.
Ping?

/mjt

On 18.09.2012 18:32, Andreas Färber wrote:
> Am 18.09.2012 14:29, schrieb Michael Tokarev:
>> Has it been applied to anything?  I don't think so.
>> Is it still needed?
> 
> Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.
> 
> /-F
> 
>>
>> Thanks,
>>
>> /mjt
>>
>> On 07.06.2012 20:23, Andreas Färber wrote:
>>> config-devices.mak.d is included from Makefile.target, i.e. from inside
>>> the *-softmmu/ directory. It included the directory path, so never
>>> applied to the actual config-devices.mak. Symptoms were spurious
>>> dependency issues with default-configs/pci.mak.
>>>
>>> Fix by using `basename` to strip the directory path.
>>>
>>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>> ---
>>>  Seems I forgot to send this out before 1.1...
>>>
>>>  scripts/make_device_config.sh |    2 +-
>>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
>>> index 5d14885..0778fe2 100644
>>> --- a/scripts/make_device_config.sh
>>> +++ b/scripts/make_device_config.sh
>>> @@ -25,4 +25,4 @@ done
>>>  process_includes $src > $dest
>>>  
>>>  cat $src $all_includes | grep -v '^include' > $dest
>>> -echo "$1: $all_includes" > $dep
>>> +echo "`basename $1`: $all_includes" > $dep
>>
> 
>
Michael Roth - Dec. 3, 2012, 7:31 p.m.
On Sat, Oct 27, 2012 at 12:32:28PM +0400, Michael Tokarev wrote:
> Ping?

Ping.

Fix still applicable for 1.3, also looking to pull it in for 1.2.2.

> 
> /mjt
> 
> On 18.09.2012 18:32, Andreas Färber wrote:
> > Am 18.09.2012 14:29, schrieb Michael Tokarev:
> >> Has it been applied to anything?  I don't think so.
> >> Is it still needed?
> > 
> > Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.
> > 
> > /-F
> > 
> >>
> >> Thanks,
> >>
> >> /mjt
> >>
> >> On 07.06.2012 20:23, Andreas Färber wrote:
> >>> config-devices.mak.d is included from Makefile.target, i.e. from inside
> >>> the *-softmmu/ directory. It included the directory path, so never
> >>> applied to the actual config-devices.mak. Symptoms were spurious
> >>> dependency issues with default-configs/pci.mak.
> >>>
> >>> Fix by using `basename` to strip the directory path.
> >>>
> >>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
> >>> Signed-off-by: Andreas Färber <afaerber@suse.de>
> >>> ---
> >>>  Seems I forgot to send this out before 1.1...
> >>>
> >>>  scripts/make_device_config.sh |    2 +-
> >>>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>>
> >>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
> >>> index 5d14885..0778fe2 100644
> >>> --- a/scripts/make_device_config.sh
> >>> +++ b/scripts/make_device_config.sh
> >>> @@ -25,4 +25,4 @@ done
> >>>  process_includes $src > $dest
> >>>  
> >>>  cat $src $all_includes | grep -v '^include' > $dest
> >>> -echo "$1: $all_includes" > $dep
> >>> +echo "`basename $1`: $all_includes" > $dep
> >>
> > 
> > 
> 
>
Michael Tokarev - Jan. 24, 2013, 10:18 a.m.
Guys, it isn't sane anymore.  It if FAR from being funny.

Ping^7.. if i counted correctly...

03.12.2012 23:31, mdroth wrote:
> On Sat, Oct 27, 2012 at 12:32:28PM +0400, Michael Tokarev wrote:
>> Ping?
>
> Ping.
>
> Fix still applicable for 1.3, also looking to pull it in for 1.2.2.
>
>>
>> /mjt
>>
>> On 18.09.2012 18:32, Andreas Färber wrote:
>>> Am 18.09.2012 14:29, schrieb Michael Tokarev:
>>>> Has it been applied to anything?  I don't think so.
>>>> Is it still needed?
>>>
>>> Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.
>>>
>>> /-F
>>>
>>>>
>>>> Thanks,
>>>>
>>>> /mjt
>>>>
>>>> On 07.06.2012 20:23, Andreas Färber wrote:
>>>>> config-devices.mak.d is included from Makefile.target, i.e. from inside
>>>>> the *-softmmu/ directory. It included the directory path, so never
>>>>> applied to the actual config-devices.mak. Symptoms were spurious
>>>>> dependency issues with default-configs/pci.mak.
>>>>>
>>>>> Fix by using `basename` to strip the directory path.
>>>>>
>>>>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
>>>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>>>> ---
>>>>>   Seems I forgot to send this out before 1.1...
>>>>>
>>>>>   scripts/make_device_config.sh |    2 +-
>>>>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>>>>
>>>>> diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
>>>>> index 5d14885..0778fe2 100644
>>>>> --- a/scripts/make_device_config.sh
>>>>> +++ b/scripts/make_device_config.sh
>>>>> @@ -25,4 +25,4 @@ done
>>>>>   process_includes $src > $dest
>>>>>
>>>>>   cat $src $all_includes | grep -v '^include' > $dest
>>>>> -echo "$1: $all_includes" > $dep
>>>>> +echo "`basename $1`: $all_includes" > $dep
>>>>
>>>
>>>
>>
>>
>
Andreas Färber - Jan. 24, 2013, 10:52 a.m.
Am 24.01.2013 11:18, schrieb Michael Tokarev:
> Guys, it isn't sane anymore.  It if FAR from being funny.
> 
> Ping^7.. if i counted correctly...

Anthony asked me to resend this one but I haven't found it among all my
branches and repositories yet o:-) and had higher priorities. Further, I
have not encountered it recently - it was about additions to pci.mak
*sometimes* breaking the build due to bad ordering (back then: megasas).

However, I'm not aware of recent build system changes that would
obsolete this patch - Paolo is still CC.

Andreas

> 
> 03.12.2012 23:31, mdroth wrote:
>> On Sat, Oct 27, 2012 at 12:32:28PM +0400, Michael Tokarev wrote:
>>> Ping?
>>
>> Ping.
>>
>> Fix still applicable for 1.3, also looking to pull it in for 1.2.2.
>>
>>>
>>> /mjt
>>>
>>> On 18.09.2012 18:32, Andreas Färber wrote:
>>>> Am 18.09.2012 14:29, schrieb Michael Tokarev:
>>>>> Has it been applied to anything?  I don't think so.
>>>>> Is it still needed?
>>>>
>>>> Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.
>>>>
>>>> /-F
>>>>
>>>>>
>>>>> Thanks,
>>>>>
>>>>> /mjt
>>>>>
>>>>> On 07.06.2012 20:23, Andreas Färber wrote:
>>>>>> config-devices.mak.d is included from Makefile.target, i.e. from
>>>>>> inside
>>>>>> the *-softmmu/ directory. It included the directory path, so never
>>>>>> applied to the actual config-devices.mak. Symptoms were spurious
>>>>>> dependency issues with default-configs/pci.mak.
>>>>>>
>>>>>> Fix by using `basename` to strip the directory path.
>>>>>>
>>>>>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
>>>>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>>>>> ---
>>>>>>   Seems I forgot to send this out before 1.1...
>>>>>>
>>>>>>   scripts/make_device_config.sh |    2 +-
>>>>>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>>>>>
>>>>>> diff --git a/scripts/make_device_config.sh
>>>>>> b/scripts/make_device_config.sh
>>>>>> index 5d14885..0778fe2 100644
>>>>>> --- a/scripts/make_device_config.sh
>>>>>> +++ b/scripts/make_device_config.sh
>>>>>> @@ -25,4 +25,4 @@ done
>>>>>>   process_includes $src > $dest
>>>>>>
>>>>>>   cat $src $all_includes | grep -v '^include' > $dest
>>>>>> -echo "$1: $all_includes" > $dep
>>>>>> +echo "`basename $1`: $all_includes" > $dep
>>>>>
>>>>
>>>>
>>>
>>>
>>
>
Paolo Bonzini - Jan. 24, 2013, 2:34 p.m.
Il 24/01/2013 11:52, Andreas Färber ha scritto:
>> > Ping^7.. if i counted correctly...
> Anthony asked me to resend this one but I haven't found it among all my
> branches and repositories yet o:-) and had higher priorities. Further, I
> have not encountered it recently - it was about additions to pci.mak
> *sometimes* breaking the build due to bad ordering (back then: megasas).
> 
> However, I'm not aware of recent build system changes that would
> obsolete this patch - Paolo is still CC.

Yeah, the patch is good.  I had totally missed it, sorry.

Paolo
Anthony Liguori - Jan. 24, 2013, 2:43 p.m.
Andreas Färber <afaerber@suse.de> writes:

> Am 24.01.2013 11:18, schrieb Michael Tokarev:
>> Guys, it isn't sane anymore.  It if FAR from being funny.
>> 
>> Ping^7.. if i counted correctly...
>
> Anthony asked me to resend this one but I haven't found it among all my
> branches and repositories yet o:-)

I don't even have a copy of this patch in my mail history so it really
needs to be resubmitted.  I'd be amazed after all of this time if it
didn't need reworking.

Regards,

Anthony Liguori

> and had higher priorities. Further, I
> have not encountered it recently - it was about additions to pci.mak
> *sometimes* breaking the build due to bad ordering (back then: megasas).
>
> However, I'm not aware of recent build system changes that would
> obsolete this patch - Paolo is still CC.
>
> Andreas
>
>> 
>> 03.12.2012 23:31, mdroth wrote:
>>> On Sat, Oct 27, 2012 at 12:32:28PM +0400, Michael Tokarev wrote:
>>>> Ping?
>>>
>>> Ping.
>>>
>>> Fix still applicable for 1.3, also looking to pull it in for 1.2.2.
>>>
>>>>
>>>> /mjt
>>>>
>>>> On 18.09.2012 18:32, Andreas Färber wrote:
>>>>> Am 18.09.2012 14:29, schrieb Michael Tokarev:
>>>>>> Has it been applied to anything?  I don't think so.
>>>>>> Is it still needed?
>>>>>
>>>>> Not in qemu.git yet, still applicable AFAICT. CC'ing Paolo.
>>>>>
>>>>> /-F
>>>>>
>>>>>>
>>>>>> Thanks,
>>>>>>
>>>>>> /mjt
>>>>>>
>>>>>> On 07.06.2012 20:23, Andreas Färber wrote:
>>>>>>> config-devices.mak.d is included from Makefile.target, i.e. from
>>>>>>> inside
>>>>>>> the *-softmmu/ directory. It included the directory path, so never
>>>>>>> applied to the actual config-devices.mak. Symptoms were spurious
>>>>>>> dependency issues with default-configs/pci.mak.
>>>>>>>
>>>>>>> Fix by using `basename` to strip the directory path.
>>>>>>>
>>>>>>> Reported-by: Gerhard Wiesinger <lists@wiesinger.com>
>>>>>>> Signed-off-by: Andreas Färber <afaerber@suse.de>
>>>>>>> ---
>>>>>>>   Seems I forgot to send this out before 1.1...
>>>>>>>
>>>>>>>   scripts/make_device_config.sh |    2 +-
>>>>>>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>>>>>>
>>>>>>> diff --git a/scripts/make_device_config.sh
>>>>>>> b/scripts/make_device_config.sh
>>>>>>> index 5d14885..0778fe2 100644
>>>>>>> --- a/scripts/make_device_config.sh
>>>>>>> +++ b/scripts/make_device_config.sh
>>>>>>> @@ -25,4 +25,4 @@ done
>>>>>>>   process_includes $src > $dest
>>>>>>>
>>>>>>>   cat $src $all_includes | grep -v '^include' > $dest
>>>>>>> -echo "$1: $all_includes" > $dep
>>>>>>> +echo "`basename $1`: $all_includes" > $dep
>>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>
>> 
>
>
> -- 
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Paolo Bonzini - Jan. 24, 2013, 2:46 p.m.
Il 24/01/2013 15:43, Anthony Liguori ha scritto:
>>> >> Ping^7.. if i counted correctly...
>> >
>> > Anthony asked me to resend this one but I haven't found it among all my
>> > branches and repositories yet o:-)
> I don't even have a copy of this patch in my mail history so it really
> needs to be resubmitted.  I'd be amazed after all of this time if it
> didn't need reworking.

Be amazed. :)  Though it's a oneliner and something that really has
never been changed!

Paolo

Patch

diff --git a/scripts/make_device_config.sh b/scripts/make_device_config.sh
index 5d14885..0778fe2 100644
--- a/scripts/make_device_config.sh
+++ b/scripts/make_device_config.sh
@@ -25,4 +25,4 @@  done
 process_includes $src > $dest
 
 cat $src $all_includes | grep -v '^include' > $dest
-echo "$1: $all_includes" > $dep
+echo "`basename $1`: $all_includes" > $dep