[oe-commits] [bitbake] 16/17: cooker: Ensure buildFile doesn't have lasting side effects

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 0a7ee8c8378bba9877c260b1aee782878f1935b4
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Aug 30 21:17:51 2017 +0100

    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 at linuxfoundation.org>
---
 lib/bb/cooker.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 1ed3fd4..ab3de91 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.