summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-11 10:22:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:35:28 +0000
commit335eb2db228f7543a49de71f063ac72b865c947a (patch)
treedf48dd20ef04b4b15b3c584129ff87e68a768e0c
parent021f2eb55ab5863b57ed1b3f19f1b329bc1ad477 (diff)
downloadbitbake-335eb2db228f7543a49de71f063ac72b865c947a.tar.gz
cooker: Ensure BB_CONSOLE remains correct over server resets
The console log data is written to is created at console initialisation time and does not change over reset events. This ensures the BB_CONSOLELOG value is correct over such resets by preserving it. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cooker.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 276e42eec..4df88818f 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -255,6 +255,11 @@ class BBCooker:
self.state = state.initial
self.caches_array = []
+ # Need to preserve BB_CONSOLELOG over resets
+ consolelog = None
+ if hasattr(self, "data"):
+ consolelog = self.data.getVar("BB_CONSOLELOG", True)
+
if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
self.enableDataTracking()
@@ -281,6 +286,8 @@ class BBCooker:
self.data = self.databuilder.data
self.data_hash = self.databuilder.data_hash
+ if consolelog:
+ self.data.setVar("BB_CONSOLELOG", consolelog)
# we log all events to a file if so directed
if self.configuration.writeeventlog: