summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-30 21:17:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-31 17:43:34 +0100
commit0a7ee8c8378bba9877c260b1aee782878f1935b4 (patch)
tree5b02ba2f1c55cbf478ea8195c198b5c43fb0be9e
parent8c4b35d1e4d31bae9fddd129d5ba230acb72c3bb (diff)
downloadbitbake-contrib-0a7ee8c8378bba9877c260b1aee782878f1935b4.tar.gz
bitbake-contrib-0a7ee8c8378bba9877c260b1aee782878f1935b4.tar.bz2
bitbake-contrib-0a7ee8c8378bba9877c260b1aee782878f1935b4.zip
cooker: Ensure buildFile doesn't have lasting side effects
BB_SERVER_TIMEOUT=100 oe-selftest -r devtool.DevtoolTests.test_devtool_build_image fails, the reason is that internally, the limited_deps flag is set in the bitbake server and then never cleared. This causes the sysroots to be setup incorrectly (as per the limited dependency case) and builds break. There is also potential for corruption of recipecaches. Add shutdown/cleanup code to ensure these effects don't 'stick'. This bug is particularly nasty as you can destroy TMPDIR with large sysroots in build work directories which are prone to break. Also ensure mtime cache is cleared (to match buildTargets) and that no lasting changes are made to siggen either which ensures: BB_SERVER_TIMEOUT=100 oe-selftest -r devtool.DevtoolTests.test_devtool_upgrade_git devtool.DevtoolTests.test_devtool_virtual_kernel_modify works. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 1ed3fd4cea..ab3de91dac 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1276,6 +1276,7 @@ class BBCooker:
fn = self.matchFile(fn)
self.buildSetVars()
+ self.reset_mtime_caches()
bb_cache = bb.cache.Cache(self.databuilder, self.data_hash, self.caches_array)
@@ -1356,6 +1357,10 @@ class BBCooker:
if fireevents:
bb.event.fire(bb.event.BuildCompleted(len(rq.rqdata.runtaskentries), buildname, item, failures, interrupted), self.databuilder.mcdata[mc])
self.command.finishAsyncCommand(msg)
+ # We trashed self.recipecaches above
+ self.parsecache_valid = False
+ self.configuration.limited_deps = False
+ bb.parse.siggen.reset(self.data)
if quietlog:
bb.runqueue.logger.setLevel(rqloglevel)
return False