cooker: check if target contains task
PATCH 1/1 cooker: check if target contains task
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]
--- bitbake/lib/bb/cooker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
bitbake/lib/bb/cooker.py +2 -1
@@ -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)
Signature · 1 line
2.1.4
Quoted 21 lines · Ed Bartosh
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 <[email protected]>---
bitbake/lib/bb/cooker.py | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)bitbake/lib/bb/cooker.py +0
-0@@ -1421,7 +1421,8 @@ class BBCooker:if not
task.startswith("do_"):
task = "do_%s" % task
- packages = ["%s:%s" % (target, task) for target in targets]
Quoted 8 lines
+ 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
Quoted 34 lines · Richard Purdie
Quoted 21 lines · Ed Bartosh
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 <[email protected]>---
bitbake/lib/bb/cooker.py | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)bitbake/lib/bb/cooker.py +0
-0@@ -1421,7 +1421,8 @@ class BBCooker:if not
task.startswith("do_"):
task = "do_%s" % task
- packages = ["%s:%s" % (target, task) for target in targets]Quoted 8 lines
+ 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:
Sorry for the typo. I'll send an update in a minute.
--
Regards,
Ed
PATCH v2 1/1 cooker: check if target contains task
In reply to Richard PurdieTask 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]
--- bitbake/lib/bb/cooker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
bitbake/lib/bb/cooker.py +2 -1
@@ -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)
Signature · 1 line
2.1.4