[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7494/8267] bitbake: cooker: Ensure buildFile doesn't have lasting side effects



commit fcac678c6c74185f411e8548165c824bf087d37f
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Wed Aug 30 21:17:51 2017 +0100

    bitbake: 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.
    
    (Bitbake rev: 0a7ee8c8378bba9877c260b1aee782878f1935b4)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 1ed3fd4..ab3de91 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/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


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]