Re: [PATCH] meta/classes/base: Fix showdata and liststasks after bitbake update

[Alexander Smirnov <asmirnov@ilbers.de>]

On 02/08/2018 06:24 PM, Claudius Heine wrote:
> Hi Alex,
> 
> On 02/08/2018 02:55 PM, Alexander Smirnov wrote:
>> Hi,
>>
>> On 02/08/2018 02:26 PM, claudius.heine.ext@siemens.com wrote:
>>> From: Claudius Heine <ch@denx.de>
>>>
>>> Those tasks were broken, this patchs fixes by implementing them similar
>>> to how openembedded-core does it.
>>>
>>
>> I see that this code is identical to OE one, do you know which 
>> copyright it is? If this code is copied from OE, I think it makes 
>> sense to mention this explicitly in the code.
> 
> Sure, I got it from [1], and this file does not have an own header, so I 
> suppose its MIT or GPLv2. I don't know if this falls under 'metadata' or 
> not. Since Isar uses the same licenses, you might know what exactly is 
> meant by that.
> 
> How are you proposing to name the authors?

I see it something like:

# Derived from openembedded-core/meta/classes/utility-tasks.bbclass

@Jan: do you think we should keep this reference?

Alex

> 
> Cheers,
> Claudius
> 
> [1] 
> http://git.openembedded.org/openembedded-core/tree/meta/classes/utility-tasks.bbclass 
> 
> 
>>
>> Alex
>>
>>> Signed-off-by: Claudius Heine <ch@denx.de>
>>> ---
>>>   meta/classes/base.bbclass | 28 +++++++++++++++++-----------
>>>   1 file changed, 17 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
>>> index 7d44f72..448dd67 100644
>>> --- a/meta/classes/base.bbclass
>>> +++ b/meta/classes/base.bbclass
>>> @@ -40,22 +40,28 @@ bbfatal() {
>>>   addtask showdata
>>>   do_showdata[nostamp] = "1"
>>>   python do_showdata() {
>>> -    import sys
>>> -    # emit variables and shell functions
>>> -    bb.data.emit_env(sys.__stdout__, d, True)
>>> -    # emit the metadata which isnt valid shell
>>> -    for e in bb.data.keys(d):
>>> -        if bb.data.getVarFlag(e, 'python', d):
>>> -            sys.__stdout__.write("\npython %s () {\n%s}\n" % (e, 
>>> bb.data.getVar(e, d, 1)))
>>> +    for e in d.keys():
>>> +        if d.getVarFlag(e, 'python'):
>>> +            bb.plain("\npython %s () {\n%s}\n" % (e, d.getVar(e, 
>>> True)))
>>>   }
>>>   addtask listtasks
>>>   do_listtasks[nostamp] = "1"
>>>   python do_listtasks() {
>>> -    import sys
>>> -    for e in bb.data.keys(d):
>>> -        if bb.data.getVarFlag(e, 'task', d):
>>> -            sys.__stdout__.write("%s\n" % e)
>>> +    taskdescs = {}
>>> +    maxlen = 0
>>> +    for e in d.keys():
>>> +        if d.getVarFlag(e, 'task'):
>>> +            maxlen = max(maxlen, len(e))
>>> +            if e.endswith('_setscene'):
>>> +                desc = "%s (setscene version)" % 
>>> (d.getVarFlag(e[:-9], 'doc') or '')
>>> +            else:
>>> +                desc = d.getVarFlag(e, 'doc') or ''
>>> +            taskdescs[e] = desc
>>> +
>>> +    tasks = sorted(taskdescs.keys())
>>> +    for taskname in tasks:
>>> +        bb.plain("%s  %s" % (taskname.ljust(maxlen), 
>>> taskdescs[taskname]))
>>>   }
>>>   do_fetch[dirs] = "${DL_DIR}"
>>>
> 

-- 
With best regards,
Alexander Smirnov

ilbers GmbH
Baierbrunner Str. 28c
D-81379 Munich
+49 (89) 122 67 24-0
http://ilbers.de/
Commercial register Munich, HRB 214197
General manager: Baurzhan Ismagulov