]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
cooker: check if target contains task
authorEd Bartosh <ed.bartosh@linux.intel.com>
Thu, 15 Sep 2016 08:26:28 +0000 (11:26 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 16 Sep 2016 14:19:33 +0000 (15:19 +0100)
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/cooker.py

index 0e78106d2911863d92df43aae11640826caf8afc..cc8891f48b401090a8c70f3f887250df65316f27 100644 (file)
@@ -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)