]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: runqueue: Wait for covered tasks to complete before trying setscene
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 13 Aug 2019 15:00:06 +0000 (16:00 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 14 Aug 2019 16:28:23 +0000 (17:28 +0100)
If tasks are in the covered list of tasks for a given setscene task,
it needs to wait for those to complete before we can start.

(Bitbake rev: fdee640c26750b852eb68f5c80437377aa300ed8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
bitbake/lib/bb/runqueue.py

index 29786c400b7849a5b05e1ed8cf4a714bb7a6ab79..9acad7af8e1c9a397695526615b7ebb6d4fb2be4 100644 (file)
@@ -1920,6 +1920,10 @@ class RunQueueExecute:
                             if nexttask in self.sq_deferred:
                                 del self.sq_deferred[nexttask]
                             return True
+                    # If covered tasks are running, need to wait for them to complete
+                    for t in self.sqdata.sq_covered_tasks[nexttask]:
+                        if t in self.runq_running and t not in self.runq_complete:
+                            continue
                     if nexttask in self.sq_deferred:
                         if self.sq_deferred[nexttask] not in self.runq_complete:
                             continue