diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 08af03a0f9..89410c297f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -81,7 +81,7 @@ class SkippedPackage: | |||
81 | 81 | ||
82 | 82 | ||
83 | class CookerFeatures(object): | 83 | class CookerFeatures(object): |
84 | _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE] = range(2) | 84 | _feature_list = [HOB_EXTRA_CACHES, SEND_DEPENDS_TREE, BASEDATASTORE_TRACKING] = range(3) |
85 | 85 | ||
86 | def __init__(self): | 86 | def __init__(self): |
87 | self._features=set() | 87 | self._features=set() |
@@ -177,6 +177,9 @@ class BBCooker: | |||
177 | self.data.disableTracking() | 177 | self.data.disableTracking() |
178 | 178 | ||
179 | def loadConfigurationData(self): | 179 | def loadConfigurationData(self): |
180 | if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: | ||
181 | self.enableDataTracking() | ||
182 | |||
180 | self.initConfigurationData() | 183 | self.initConfigurationData() |
181 | self.databuilder.parseBaseConfiguration() | 184 | self.databuilder.parseBaseConfiguration() |
182 | self.data = self.databuilder.data | 185 | self.data = self.databuilder.data |
@@ -189,6 +192,10 @@ class BBCooker: | |||
189 | bb.data.update_data(self.event_data) | 192 | bb.data.update_data(self.event_data) |
190 | bb.parse.init_parser(self.event_data) | 193 | bb.parse.init_parser(self.event_data) |
191 | 194 | ||
195 | if CookerFeatures.BASEDATASTORE_TRACKING in self.featureset: | ||
196 | self.disableDataTracking() | ||
197 | |||
198 | |||
192 | def modifyConfigurationVar(self, var, val, default_file, op): | 199 | def modifyConfigurationVar(self, var, val, default_file, op): |
193 | if op == "append": | 200 | if op == "append": |
194 | self.appendConfigurationVar(var, val, default_file) | 201 | self.appendConfigurationVar(var, val, default_file) |
@@ -348,7 +355,6 @@ class BBCooker: | |||
348 | open(confpath, 'w').close() | 355 | open(confpath, 'w').close() |
349 | 356 | ||
350 | def parseConfiguration(self): | 357 | def parseConfiguration(self): |
351 | |||
352 | # Set log file verbosity | 358 | # Set log file verbosity |
353 | verboselogs = bb.utils.to_boolean(self.data.getVar("BB_VERBOSE_LOGS", "0")) | 359 | verboselogs = bb.utils.to_boolean(self.data.getVar("BB_VERBOSE_LOGS", "0")) |
354 | if verboselogs: | 360 | if verboselogs: |
@@ -1203,7 +1209,10 @@ class BBCooker: | |||
1203 | try: | 1209 | try: |
1204 | v = self.data.getVar(k, True) | 1210 | v = self.data.getVar(k, True) |
1205 | if not k.startswith("__") and not isinstance(v, bb.data_smart.DataSmart): | 1211 | if not k.startswith("__") and not isinstance(v, bb.data_smart.DataSmart): |
1206 | dump[k] = { 'v' : v } | 1212 | dump[k] = { |
1213 | 'v' : v , | ||
1214 | 'history' : self.data.varhistory.variable(k), | ||
1215 | } | ||
1207 | for d in flaglist: | 1216 | for d in flaglist: |
1208 | dump[k][d] = self.data.getVarFlag(k, d) | 1217 | dump[k][d] = self.data.getVarFlag(k, d) |
1209 | except Exception as e: | 1218 | except Exception as e: |