[PATCH 0/2] Fix utility-tasks.bbclass and nopackages.bbclass

[PATCH 0/2] Fix utility-tasks.bbclass and nopackages.bbclass

[Robert Yang]

The following changes since commit bb4ead9b7b1400c37a72d148d9775bdf4210ec37:

  linux-yocto/4.4: integrate v4.4.11 (2016-05-25 07:49:55 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/list
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/list

Robert Yang (2):
  utility-tasks.bbclass: fix do_listtasks
  nopackages.bbclass: deltask foo_setscene

 meta/classes/nopackages.bbclass    |  6 ++++++
 meta/classes/utility-tasks.bbclass | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

-- 
2.8.0

[PATCH 1/2] utility-tasks.bbclass: fix do_listtasks

[Robert Yang]

It lists deleted tasks which is unexpected, use __BBTASKS to fix the
problem since deltask() which is defined in bitbake/lib/bb/build.py
updates __BBTASKS correctly.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/utility-tasks.bbclass | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/classes/utility-tasks.bbclass b/meta/classes/utility-tasks.bbclass
index 7bc584a..b06d335 100644
--- a/meta/classes/utility-tasks.bbclass
+++ b/meta/classes/utility-tasks.bbclass
@@ -3,14 +3,14 @@ do_listtasks[nostamp] = "1"
 python do_listtasks() {
     taskdescs = {}
     maxlen = 0
-    for e in d.keys():
-        if d.getVarFlag(e, 'task', True):
-            maxlen = max(maxlen, len(e))
-            if e.endswith('_setscene'):
-                desc = "%s (setscene version)" % (d.getVarFlag(e[:-9], 'doc', True) or '')
-            else:
-                desc = d.getVarFlag(e, 'doc', True) or ''
-            taskdescs[e] = desc
+    bbtasks = d.getVar('__BBTASKS', True)
+    for task in bbtasks:
+        maxlen = max(maxlen, len(task))
+        if task.endswith('_setscene'):
+            desc = "%s (setscene version)" % (d.getVarFlag(task[:-9], 'doc', True) or '')
+        else:
+            desc = d.getVarFlag(task, 'doc', True) or ''
+        taskdescs[task] = desc
 
     tasks = sorted(taskdescs.keys())
     for taskname in tasks:
-- 
2.8.0

Re: [PATCH 1/2] utility-tasks.bbclass: fix do_listtasks

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 368 bytes --]

On 25 May 2016 at 10:23, Robert Yang <liezhi.yang@windriver.com> wrote:

> It lists deleted tasks which is unexpected, use __BBTASKS to fix the
> problem since deltask() which is defined in bitbake/lib/bb/build.py
> updates __BBTASKS correctly.
>

Wouldn't an alternative be to change deltask so that it also remove the
"task" flag from the variable?

Ross

[-- Attachment #2: Type: text/html, Size: 793 bytes --]

Re: [PATCH 1/2] utility-tasks.bbclass: fix do_listtasks

[Robert Yang]

On 05/25/2016 07:17 PM, Burton, Ross wrote:
>
> On 25 May 2016 at 10:23, Robert Yang <liezhi.yang@windriver.com
> <mailto:liezhi.yang@windriver.com>> wrote:
>
>     It lists deleted tasks which is unexpected, use __BBTASKS to fix the
>     problem since deltask() which is defined in bitbake/lib/bb/build.py
>     updates __BBTASKS correctly.
>
>
> Wouldn't an alternative be to change deltask so that it also remove the "task"
> flag from the variable?

The problem is, if we do:

d.delVarFlag(task, 'task')

Then maybe we should remove the whole task from d rather than only
remove the flags ?

// Robert

>
> Ross

Re: [PATCH 1/2] utility-tasks.bbclass: fix do_listtasks

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]

On Thu, May 26, 2016 at 1:12 AM, Robert Yang <liezhi.yang@windriver.com>
wrote:

> On 05/25/2016 07:17 PM, Burton, Ross wrote:
>
>>
>> On 25 May 2016 at 10:23, Robert Yang <liezhi.yang@windriver.com
>> <mailto:liezhi.yang@windriver.com>> wrote:
>>
>>     It lists deleted tasks which is unexpected, use __BBTASKS to fix the
>>     problem since deltask() which is defined in bitbake/lib/bb/build.py
>>     updates __BBTASKS correctly.
>>
>>
>> Wouldn't an alternative be to change deltask so that it also remove the
>> "task"
>> flag from the variable?
>>
>
> The problem is, if we do:
>
> d.delVarFlag(task, 'task')
>
> Then maybe we should remove the whole task from d rather than only
> remove the flags ?


IMO, no, deltask and addtask control whether an existing function is a task
or not, so can be run like a task. If you want the variable deleted, that's
what delVar is for.
-- 
Christopher Larson
clarson at kergoth dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Maintainer - Tslib
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1834 bytes --]

Re: [PATCH 1/2] utility-tasks.bbclass: fix do_listtasks

[Richard Purdie]

On Wed, 2016-05-25 at 02:23 -0700, Robert Yang wrote:
> It lists deleted tasks which is unexpected, use __BBTASKS to fix the
> problem since deltask() which is defined in bitbake/lib/bb/build.py
> updates __BBTASKS correctly.
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  meta/classes/utility-tasks.bbclass | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/meta/classes/utility-tasks.bbclass
> b/meta/classes/utility-tasks.bbclass
> index 7bc584a..b06d335 100644
> --- a/meta/classes/utility-tasks.bbclass
> +++ b/meta/classes/utility-tasks.bbclass
> @@ -3,14 +3,14 @@ do_listtasks[nostamp] = "1"
>  python do_listtasks() {
>      taskdescs = {}
>      maxlen = 0
> -    for e in d.keys():
> -        if d.getVarFlag(e, 'task', True):
> -            maxlen = max(maxlen, len(e))
> -            if e.endswith('_setscene'):
> -                desc = "%s (setscene version)" % (d.getVarFlag(e[:
> -9], 'doc', True) or '')
> -            else:
> -                desc = d.getVarFlag(e, 'doc', True) or ''
> -            taskdescs[e] = desc
> +    bbtasks = d.getVar('__BBTASKS', True)
> +    for task in bbtasks:
> +        maxlen = max(maxlen, len(task))
> +        if task.endswith('_setscene'):
> +            desc = "%s (setscene version)" % (d.getVarFlag(task[:
> -9], 'doc', True) or '')
> +        else:
> +            desc = d.getVarFlag(task, 'doc', True) or ''
> +        taskdescs[task] = desc
>  
>      tasks = sorted(taskdescs.keys())
>      for taskname in tasks:

__BBTASKS is a bitbake internal variable and OE should not know or care
about it, its implementation may change without warning and I won't
take bug reports about that.

We need to fix this differently.

Cheers,

Richard

[PATCH 2/2] nopackages.bbclass: deltask foo_setscene

[Robert Yang]

When deltask foo, also deltask foo_setscene.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/nopackages.bbclass | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/classes/nopackages.bbclass b/meta/classes/nopackages.bbclass
index 0c2761b..559f507 100644
--- a/meta/classes/nopackages.bbclass
+++ b/meta/classes/nopackages.bbclass
@@ -4,3 +4,9 @@ deltask do_package_write_ipk
 deltask do_package_write_deb
 deltask do_package_qa
 deltask do_packagedata
+deltask do_package_setscene
+deltask do_package_write_rpm_setscene
+deltask do_package_write_ipk_setscene
+deltask do_package_write_deb_setscene
+deltask do_package_qa_setscene
+deltask do_packagedata_setscene
-- 
2.8.0