sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Search up the directory tree for bblayers.conf 

(Bitbake rev: 1c6b31c649474b4c2b63ef9d9311e61de20bc8c2)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson 2010-04-14 14:38:18 -07:00 committed by Richard Purdie
parent 3238125138
commit c04cee7ce8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bitbake/lib/bb/cooker.py
View File

@ -510,14 +510,23 @@ class BBCooker:
else:
shell.start( self )
def _findLayerConf(self):
path = os.getcwd()
while path != "/":
bblayers = os.path.join(path, "conf", "bblayers.conf")
if os.path.exists(bblayers):
return bblayers
path, _ = os.path.split(path)
def parseConfigurationFiles(self, files):
try:
data = self.configuration.data
for f in files:
data = bb.parse.handle(f, data)
layerconf = os.path.join(os.getcwd(), "conf", "bblayers.conf")
if os.path.exists(layerconf):
layerconf = self._findLayerConf()
if layerconf:
bb.msg.debug(2, bb.msg.domain.Parsing, "Found bblayers.conf (%s)" % layerconf)
data = bb.parse.handle(layerconf, data)
@ -565,6 +574,7 @@ class BBCooker:
bb.event.fire(bb.event.ConfigParsed(), self.configuration.data)
except IOError, e:
bb.msg.fatal(bb.msg.domain.Parsing, "Error when parsing %s: %s" % (files, str(e)))
except bb.parse.ParseError, details: