mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

bitbake: cookerdata: Convert multiconfig to use BB_CURRENT_MC

Browse Source 
People are struggling with multiconfig as the point the conf file
is injected into the data store is not what people expect. We can't
really use a post config since that is too late and we can't really
use a pre config file since that is too early. In OE terms, we need
something right around the local.conf point so it behaves in a similar
way.

A way to handle this is to set the new variable BB_CURRENT_MC to be the
currently selected multiconfig, then the metadata itself can choose
when to inject the approriate configuration.

(Bitbake rev: 1469828fa747da0aaaa3e964954ff17f2b3180fa)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-12-20 19:02:11 +00:00
parent 7bab6ffc45
commit 84b3a5ac35
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitbake/lib/bb/cookerdata.py
+3 -2
View File
@@ -288,7 +288,7 @@ class CookerDataBuilder(object):
multiconfig = (self.data.getVar("BBMULTICONFIG", True) or "").split() multiconfig = (self.data.getVar("BBMULTICONFIG", True) or "").split()
for config in multiconfig: 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) bb.event.fire(bb.event.ConfigParsed(), mcdata)
self.mcdata[config] = mcdata self.mcdata[config] = mcdata
@@ -304,8 +304,9 @@ class CookerDataBuilder(object):
def _findLayerConf(self, data): def _findLayerConf(self, data):
return findConfigFile("bblayers.conf", 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 = bb.data.createCopy(self.basedata)
data.setVar("BB_CURRENT_MC", mc)
# Parse files for loading *before* bitbake.conf and any includes # Parse files for loading *before* bitbake.conf and any includes
for f in prefiles: for f in prefiles: