* [PATCH] externalsrc: Use deltask API
@ 2013-12-18 11:30 Richard Purdie
2013-12-20 18:24 ` Paul Barker
0 siblings, 1 reply; 3+ messages in thread
From: Richard Purdie @ 2013-12-18 11:30 UTC (permalink / raw)
To: openembedded-core
Now we have deltask API, stop poking around bitbake internal variables.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index c759289..53c71cb 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -26,21 +26,6 @@
SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch"
-def remove_tasks(tasks, deltasks, d):
- for task in tasks:
- deps = d.getVarFlag(task, "deps")
- for preptask in deltasks:
- if preptask in deps:
- deps.remove(preptask)
- d.setVarFlag(task, "deps", deps)
- # Poking around bitbake internal variables is evil but there appears to be no better way :(
- tasklist = d.getVar('__BBTASKS') or []
- for task in deltasks:
- d.delVarFlag(task, "task")
- if task in tasklist:
- tasklist.remove(task)
- d.setVar('__BBTASKS', tasklist)
-
python () {
externalsrc = d.getVar('EXTERNALSRC', True)
if externalsrc:
@@ -53,16 +38,16 @@ python () {
d.setVar('SRC_URI', '')
tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys())
- covered = d.getVar("SRCTREECOVEREDTASKS", True).split()
for task in tasks:
if task.endswith("_setscene"):
# sstate is never going to work for external source trees, disable it
- covered.append(task)
+ bb.build.deltask(task, d)
else:
# Since configure will likely touch ${S}, ensure only we lock so one task has access at a time
d.appendVarFlag(task, "lockfiles", "${S}/singletask.lock")
- remove_tasks(tasks, covered, d)
+ for task in covered:
+ bb.build.deltask(task, d)
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] externalsrc: Use deltask API
2013-12-18 11:30 [PATCH] externalsrc: Use deltask API Richard Purdie
@ 2013-12-20 18:24 ` Paul Barker
2013-12-21 9:01 ` Richard Purdie
0 siblings, 1 reply; 3+ messages in thread
From: Paul Barker @ 2013-12-20 18:24 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 18 December 2013 11:30, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> Now we have deltask API, stop poking around bitbake internal variables.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index c759289..53c71cb 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
> @@ -26,21 +26,6 @@
>
> SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch"
>
> -def remove_tasks(tasks, deltasks, d):
> - for task in tasks:
> - deps = d.getVarFlag(task, "deps")
> - for preptask in deltasks:
> - if preptask in deps:
> - deps.remove(preptask)
> - d.setVarFlag(task, "deps", deps)
> - # Poking around bitbake internal variables is evil but there appears to be no better way :(
> - tasklist = d.getVar('__BBTASKS') or []
> - for task in deltasks:
> - d.delVarFlag(task, "task")
> - if task in tasklist:
> - tasklist.remove(task)
> - d.setVar('__BBTASKS', tasklist)
> -
> python () {
> externalsrc = d.getVar('EXTERNALSRC', True)
> if externalsrc:
> @@ -53,16 +38,16 @@ python () {
> d.setVar('SRC_URI', '')
>
> tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys())
> - covered = d.getVar("SRCTREECOVEREDTASKS", True).split()
>
> for task in tasks:
> if task.endswith("_setscene"):
> # sstate is never going to work for external source trees, disable it
> - covered.append(task)
> + bb.build.deltask(task, d)
> else:
> # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time
> d.appendVarFlag(task, "lockfiles", "${S}/singletask.lock")
>
> - remove_tasks(tasks, covered, d)
> + for task in covered:
> + bb.build.deltask(task, d)
> }
>
I've just updated oe-core whilst trying to test my in-development
version of opkg using externalsrc and I'm getting:
*** 0022: for task in covered:
0023: bb.build.deltask(task, d)
0024:
Exception: NameError: global name 'covered' is not defined
I don't really know the code in question well so I don't know whether
the solution is to remove that last for loop or to add back in the
declaration of 'covered'.
--
Paul Barker
Email: paul@paulbarker.me.uk
http://www.paulbarker.me.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] externalsrc: Use deltask API
2013-12-20 18:24 ` Paul Barker
@ 2013-12-21 9:01 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2013-12-21 9:01 UTC (permalink / raw)
To: Paul Barker; +Cc: openembedded-core
On Fri, 2013-12-20 at 18:24 +0000, Paul Barker wrote:
> On 18 December 2013 11:30, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> > Now we have deltask API, stop poking around bitbake internal variables.
> >
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > ---
> > diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> > index c759289..53c71cb 100644
> > --- a/meta/classes/externalsrc.bbclass
> > +++ b/meta/classes/externalsrc.bbclass
> > @@ -26,21 +26,6 @@
> >
> > SRCTREECOVEREDTASKS ?= "do_patch do_unpack do_fetch"
> >
> > -def remove_tasks(tasks, deltasks, d):
> > - for task in tasks:
> > - deps = d.getVarFlag(task, "deps")
> > - for preptask in deltasks:
> > - if preptask in deps:
> > - deps.remove(preptask)
> > - d.setVarFlag(task, "deps", deps)
> > - # Poking around bitbake internal variables is evil but there appears to be no better way :(
> > - tasklist = d.getVar('__BBTASKS') or []
> > - for task in deltasks:
> > - d.delVarFlag(task, "task")
> > - if task in tasklist:
> > - tasklist.remove(task)
> > - d.setVar('__BBTASKS', tasklist)
> > -
> > python () {
> > externalsrc = d.getVar('EXTERNALSRC', True)
> > if externalsrc:
> > @@ -53,16 +38,16 @@ python () {
> > d.setVar('SRC_URI', '')
> >
> > tasks = filter(lambda k: d.getVarFlag(k, "task"), d.keys())
> > - covered = d.getVar("SRCTREECOVEREDTASKS", True).split()
> >
> > for task in tasks:
> > if task.endswith("_setscene"):
> > # sstate is never going to work for external source trees, disable it
> > - covered.append(task)
> > + bb.build.deltask(task, d)
> > else:
> > # Since configure will likely touch ${S}, ensure only we lock so one task has access at a time
> > d.appendVarFlag(task, "lockfiles", "${S}/singletask.lock")
> >
> > - remove_tasks(tasks, covered, d)
> > + for task in covered:
> > + bb.build.deltask(task, d)
> > }
> >
>
> I've just updated oe-core whilst trying to test my in-development
> version of opkg using externalsrc and I'm getting:
>
> *** 0022: for task in covered:
> 0023: bb.build.deltask(task, d)
> 0024:
> Exception: NameError: global name 'covered' is not defined
>
> I don't really know the code in question well so I don't know whether
> the solution is to remove that last for loop or to add back in the
> declaration of 'covered'.
Sorry about that, I think I've mixed up some patches. I've pushed
something which should fix it.
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-12-21 9:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-18 11:30 [PATCH] externalsrc: Use deltask API Richard Purdie
2013-12-20 18:24 ` Paul Barker
2013-12-21 9:01 ` Richard Purdie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox