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