diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-09-15 11:26:28 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-16 15:24:03 +0100 |
commit | 5414b80e8df11188d8e67a37185305c34ea084bd (patch) | |
tree | a3a41bf3948dce0d6a469535792696f61aeeddad /bitbake/lib | |
parent | 088d386ddbdd7b4952ba22bba4fb7fd4c452d3d7 (diff) | |
download | poky-5414b80e8df11188d8e67a37185305c34ea084bd.tar.gz |
bitbake: 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 rev: b7faf1af3bd3110fba347fbe6e432fc4ee66590a)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 0e78106d29..cc8891f48b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -1421,7 +1421,8 @@ class BBCooker: | |||
1421 | if not task.startswith("do_"): | 1421 | if not task.startswith("do_"): |
1422 | task = "do_%s" % task | 1422 | task = "do_%s" % task |
1423 | 1423 | ||
1424 | packages = ["%s:%s" % (target, task) for target in targets] | 1424 | packages = [target if ':' in target else '%s:%s' % (target, task) for target in targets] |
1425 | |||
1425 | bb.event.fire(bb.event.BuildInit(packages), self.expanded_data) | 1426 | bb.event.fire(bb.event.BuildInit(packages), self.expanded_data) |
1426 | 1427 | ||
1427 | taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort) | 1428 | taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort) |