summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
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:52 +0000
commit3ebf7617d6c869f798807792918e1030b3ab66de (patch)
treeb557c6fc1a900c60ebb0b8c9c691a80ba686031d /bitbake/lib/bb
parent5b19b712526729e19c787fa68e0e5d8191988609 (diff)
downloadpoky-3ebf7617d6c869f798807792918e1030b3ab66de.tar.gz
bitbake: 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. (Bitbake rev: 335eb2db228f7543a49de71f063ac72b865c947a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 276e42eec2..4df88818fc 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -255,6 +255,11 @@ class BBCooker:
255 self.state = state.initial 255 self.state = state.initial
256 self.caches_array = [] 256 self.caches_array = []
257 257
258 # Need to preserve BB_CONSOLELOG over resets
259 consolelog = None
260 if hasattr(self, "data"):
261 consolelog = self.data.getVar("BB_CONSOLELOG", True)
262
258 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: 263 if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset:
259 self.enableDataTracking() 264 self.enableDataTracking()
260 265
@@ -281,6 +286,8 @@ class BBCooker:
281 self.data = self.databuilder.data 286 self.data = self.databuilder.data
282 self.data_hash = self.databuilder.data_hash 287 self.data_hash = self.databuilder.data_hash
283 288
289 if consolelog:
290 self.data.setVar("BB_CONSOLELOG", consolelog)
284 291
285 # we log all events to a file if so directed 292 # we log all events to a file if so directed
286 if self.configuration.writeeventlog: 293 if self.configuration.writeeventlog: