* [PATCH] cooker: check if target contains task
@ 2016-09-09 14:49 Ed Bartosh
2016-09-15 8:03 ` Richard Purdie
0 siblings, 1 reply; 4+ messages in thread
From: Ed Bartosh @ 2016-09-09 14:49 UTC (permalink / raw)
To: bitbake-devel
Task name was incorrectly added to the targets that already
contained :task suffix and fired with BuildInit event. This
caused Toaster to create incorrect Target objects and show
them in UI.
[YOCTO #10221]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/cooker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index b7d7a7e..2952f9e 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1421,7 +1421,8 @@ class BBCooker:
if not task.startswith("do_"):
task = "do_%s" % task
- packages = ["%s:%s" % (target, task) for target in targets]
+ packages = [target if ':' in target else '%s:%s' (target, task) for target in targets]
+
bb.event.fire(bb.event.BuildInit(packages), self.expanded_data)
taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort)
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] cooker: check if target contains task
2016-09-09 14:49 [PATCH] cooker: check if target contains task Ed Bartosh
@ 2016-09-15 8:03 ` Richard Purdie
2016-09-15 8:22 ` Ed Bartosh
2016-09-15 8:26 ` [PATCH v2] " Ed Bartosh
0 siblings, 2 replies; 4+ messages in thread
From: Richard Purdie @ 2016-09-15 8:03 UTC (permalink / raw)
To: Ed Bartosh, bitbake-devel
On Fri, 2016-09-09 at 17:49 +0300, Ed Bartosh wrote:
> Task name was incorrectly added to the targets that already
> contained :task suffix and fired with BuildInit event. This
> caused Toaster to create incorrect Target objects and show
> them in UI.
>
> [YOCTO #10221]
>
> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> ---
> bitbake/lib/bb/cooker.py | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index b7d7a7e..2952f9e 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -1421,7 +1421,8 @@ class BBCooker:
> if not task.startswith("do_"):
> task = "do_%s" % task
>
> - packages = ["%s:%s" % (target, task) for target in targets]
> + packages = [target if ':' in target else '%s:%s' (target,
> task) for target in targets]
> +
> bb.event.fire(bb.event.BuildInit(packages),
> self.expanded_data)
>
> taskdata, runlist = self.buildTaskData(targets, task,
> self.configuration.abort)
I put this into a build without looking too closely, the result was
near enough everything failed with failures like:
http://autobuilder.yocto.io:8010/builders/buildtools/builds/37
Cheers,
Richard
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] cooker: check if target contains task
2016-09-15 8:03 ` Richard Purdie
@ 2016-09-15 8:22 ` Ed Bartosh
2016-09-15 8:26 ` [PATCH v2] " Ed Bartosh
1 sibling, 0 replies; 4+ messages in thread
From: Ed Bartosh @ 2016-09-15 8:22 UTC (permalink / raw)
To: Richard Purdie; +Cc: bitbake-devel
On Thu, Sep 15, 2016 at 09:03:24AM +0100, Richard Purdie wrote:
> On Fri, 2016-09-09 at 17:49 +0300, Ed Bartosh wrote:
> > Task name was incorrectly added to the targets that already
> > contained :task suffix and fired with BuildInit event. This
> > caused Toaster to create incorrect Target objects and show
> > them in UI.
> >
> > [YOCTO #10221]
> >
> > Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
> > ---
> > bitbake/lib/bb/cooker.py | 3 ++-
> > 1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> > index b7d7a7e..2952f9e 100644
> > --- a/bitbake/lib/bb/cooker.py
> > +++ b/bitbake/lib/bb/cooker.py
> > @@ -1421,7 +1421,8 @@ class BBCooker:
> > if not task.startswith("do_"):
> > task = "do_%s" % task
> >
> > - packages = ["%s:%s" % (target, task) for target in targets]
> > + packages = [target if ':' in target else '%s:%s' (target,
> > task) for target in targets]
> > +
> > bb.event.fire(bb.event.BuildInit(packages),
> > self.expanded_data)
> >
> > taskdata, runlist = self.buildTaskData(targets, task,
> > self.configuration.abort)
>
> I put this into a build without looking too closely, the result was
> near enough everything failed with failures like:
>
> http://autobuilder.yocto.io:8010/builders/buildtools/builds/37
>
Sorry for the typo. I'll send an update in a minute.
--
Regards,
Ed
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] cooker: check if target contains task
2016-09-15 8:03 ` Richard Purdie
2016-09-15 8:22 ` Ed Bartosh
@ 2016-09-15 8:26 ` Ed Bartosh
1 sibling, 0 replies; 4+ messages in thread
From: Ed Bartosh @ 2016-09-15 8:26 UTC (permalink / raw)
To: bitbake-devel
Task name was incorrectly added to the targets that already
contained :task suffix and fired with BuildInit event. This
caused Toaster to create incorrect Target objects and show
them in UI.
[YOCTO #10221]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/cooker.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index b7d7a7e..3fc96b1 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1421,7 +1421,8 @@ class BBCooker:
if not task.startswith("do_"):
task = "do_%s" % task
- packages = ["%s:%s" % (target, task) for target in targets]
+ packages = [target if ':' in target else '%s:%s' % (target, task) for target in targets]
+
bb.event.fire(bb.event.BuildInit(packages), self.expanded_data)
taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort)
--
2.1.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-15 8:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-09 14:49 [PATCH] cooker: check if target contains task Ed Bartosh
2016-09-15 8:03 ` Richard Purdie
2016-09-15 8:22 ` Ed Bartosh
2016-09-15 8:26 ` [PATCH v2] " Ed Bartosh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.