summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 12:54:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 13:57:40 +0100
commitfe715c4d1b376b08dda36ac017c3f392fcc55870 (patch)
tree9f1543ab9bd8d0ee8a50d41aa48a5bb5dbf98f93
parent3b4b782e07ba1a0a4887216d7850bb75274570d2 (diff)
downloadpoky-fe715c4d1b376b08dda36ac017c3f392fcc55870.tar.gz
bitbake: cooker/cookerdata: Fix up event handling for hob
The init function call was clobbering data hob relies on injecting, fix this so the data injected by hob isn't overwritten. (Bitbake rev: 64ca1aa1fd5f0473196b6cd805637fa644a92173) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cooker.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index cd9cccdfce..2ae3e9d239 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -129,6 +129,7 @@ class BBCooker:
129 sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name) 129 sys.exit("FATAL: Failed to import extra cache class '%s'." % cache_name)
130 130
131 self.configuration.data = None 131 self.configuration.data = None
132 self.initConfigurationData()
132 self.loadConfigurationData() 133 self.loadConfigurationData()
133 134
134 # Take a lock so only one copy of bitbake can run against a given build 135 # Take a lock so only one copy of bitbake can run against a given build
@@ -175,7 +176,6 @@ class BBCooker:
175 self.configuration.data.disableTracking() 176 self.configuration.data.disableTracking()
176 177
177 def loadConfigurationData(self): 178 def loadConfigurationData(self):
178 self.initConfigurationData()
179 self.databuilder.parseBaseConfiguration() 179 self.databuilder.parseBaseConfiguration()
180 self.configuration.data = self.databuilder.data 180 self.configuration.data = self.databuilder.data
181 self.configuration.data_hash = self.databuilder.data_hash 181 self.configuration.data_hash = self.databuilder.data_hash
@@ -1221,6 +1221,7 @@ class BBCooker:
1221 1221
1222 def reset(self): 1222 def reset(self):
1223 self.state = state.initial 1223 self.state = state.initial
1224 self.initConfigurationData()
1224 self.loadConfigurationData() 1225 self.loadConfigurationData()
1225 1226
1226def server_main(cooker, func, *args): 1227def server_main(cooker, func, *args):