diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index c6e958b43c..d9eab562cf 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -289,7 +289,7 @@ class CookerDataBuilder(object): | |||
289 | 289 | ||
290 | multiconfig = (self.data.getVar("BBMULTICONFIG") or "").split() | 290 | multiconfig = (self.data.getVar("BBMULTICONFIG") or "").split() |
291 | for config in multiconfig: | 291 | for config in multiconfig: |
292 | mcdata = self.parseConfigurationFiles(['conf/multiconfig/%s.conf' % config] + self.prefiles, self.postfiles) | 292 | mcdata = self.parseConfigurationFiles(self.prefiles, self.postfiles, config) |
293 | bb.event.fire(bb.event.ConfigParsed(), mcdata) | 293 | bb.event.fire(bb.event.ConfigParsed(), mcdata) |
294 | self.mcdata[config] = mcdata | 294 | self.mcdata[config] = mcdata |
295 | 295 | ||
@@ -305,8 +305,9 @@ class CookerDataBuilder(object): | |||
305 | def _findLayerConf(self, data): | 305 | def _findLayerConf(self, data): |
306 | return findConfigFile("bblayers.conf", data) | 306 | return findConfigFile("bblayers.conf", data) |
307 | 307 | ||
308 | def parseConfigurationFiles(self, prefiles, postfiles): | 308 | def parseConfigurationFiles(self, prefiles, postfiles, mc = "default"): |
309 | data = bb.data.createCopy(self.basedata) | 309 | data = bb.data.createCopy(self.basedata) |
310 | data.setVar("BB_CURRENT_MC", mc) | ||
310 | 311 | ||
311 | # Parse files for loading *before* bitbake.conf and any includes | 312 | # Parse files for loading *before* bitbake.conf and any includes |
312 | for f in prefiles: | 313 | for f in prefiles: |