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 b07c266439..98f56ac7be 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -288,7 +288,7 @@ class CookerDataBuilder(object): | |||
288 | 288 | ||
289 | multiconfig = (self.data.getVar("BBMULTICONFIG", True) or "").split() | 289 | multiconfig = (self.data.getVar("BBMULTICONFIG", True) or "").split() |
290 | for config in multiconfig: | 290 | for config in multiconfig: |
291 | mcdata = self.parseConfigurationFiles(['conf/multiconfig/%s.conf' % config] + self.prefiles, self.postfiles) | 291 | mcdata = self.parseConfigurationFiles(self.prefiles, self.postfiles, config) |
292 | bb.event.fire(bb.event.ConfigParsed(), mcdata) | 292 | bb.event.fire(bb.event.ConfigParsed(), mcdata) |
293 | self.mcdata[config] = mcdata | 293 | self.mcdata[config] = mcdata |
294 | 294 | ||
@@ -304,8 +304,9 @@ class CookerDataBuilder(object): | |||
304 | def _findLayerConf(self, data): | 304 | def _findLayerConf(self, data): |
305 | return findConfigFile("bblayers.conf", data) | 305 | return findConfigFile("bblayers.conf", data) |
306 | 306 | ||
307 | def parseConfigurationFiles(self, prefiles, postfiles): | 307 | def parseConfigurationFiles(self, prefiles, postfiles, mc = "default"): |
308 | data = bb.data.createCopy(self.basedata) | 308 | data = bb.data.createCopy(self.basedata) |
309 | data.setVar("BB_CURRENT_MC", mc) | ||
309 | 310 | ||
310 | # Parse files for loading *before* bitbake.conf and any includes | 311 | # Parse files for loading *before* bitbake.conf and any includes |
311 | for f in prefiles: | 312 | for f in prefiles: |