]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
bitbake: runqueue: Small but critical fix
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 16 Aug 2019 14:41:32 +0000 (15:41 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 21 Aug 2019 14:30:13 +0000 (15:30 +0100)
We've observed do_package and do_package_setscene running in parallel. The
reason is that holdoff_tasks wasn't getting updated. Looking at the code, it
would seem the reason is that the task was in pending_migrations and hence
changed wasn't set and holdoff_tasks wasn't updated.

Fix this. It only affects builds with rehashing enabled.

(Bitbake rev: e26e61e84575669bd223f6ab316798097ed95ec8)

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

index 7fa074f6792d38eca4fc0568d41d2b1a6c9aba2c..88212ca00c00f23f93db34b2a97b8d4377f1c551 100644 (file)
@@ -2283,6 +2283,7 @@ class RunQueueExecute:
                 continue
 
             self.pending_migrations.remove(tid)
+            changed = True
 
             if tid in self.tasks_scenequeue_done:
                 self.tasks_scenequeue_done.remove(tid)