diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-10 21:49:12 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-12 14:41:32 +0100 |
commit | 36e81a844b53fed949bcf8cfc37d220c2d078a03 (patch) | |
tree | 33363cf750a2f1e4957b9052cc6979b18e3f6a5e /bitbake/lib | |
parent | e4c1c8c92e4f47b69a9d7dcccb32ee3bb1ad7d18 (diff) | |
download | poky-36e81a844b53fed949bcf8cfc37d220c2d078a03.tar.gz |
bitbake/cooker: Make sure no locks are held before we start forking workers
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index ad1d6023fd..3f6f6ef0b6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -664,6 +664,9 @@ class BBCooker: | |||
664 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) | 664 | buildname = bb.data.getVar("BUILDNAME", self.configuration.data) |
665 | bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.configuration.event_data) | 665 | bb.event.fire(bb.event.BuildStarted(buildname, [item]), self.configuration.event_data) |
666 | 666 | ||
667 | # Clear locks | ||
668 | bb.fetch.persistent_database_connection = {} | ||
669 | |||
667 | # Execute the runqueue | 670 | # Execute the runqueue |
668 | runlist = [[item, "do_%s" % task]] | 671 | runlist = [[item, "do_%s" % task]] |
669 | 672 | ||
@@ -742,6 +745,9 @@ class BBCooker: | |||
742 | runlist.append([k, "do_%s" % task]) | 745 | runlist.append([k, "do_%s" % task]) |
743 | taskdata.add_unresolved(localdata, self.status) | 746 | taskdata.add_unresolved(localdata, self.status) |
744 | 747 | ||
748 | # Clear locks | ||
749 | bb.fetch.persistent_database_connection = {} | ||
750 | |||
745 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) | 751 | rq = bb.runqueue.RunQueue(self, self.configuration.data, self.status, taskdata, runlist) |
746 | 752 | ||
747 | self.server.register_idle_function(buildTargetsIdle, rq) | 753 | self.server.register_idle_function(buildTargetsIdle, rq) |