diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-04-14 14:38:18 -0700 |
---|---|---|
committer | Chris Larson <chris_larson@mentor.com> | 2010-06-04 13:13:49 -0700 |
commit | fd40c85cb292f7c6c6a302c11d2600697d9dee09 (patch) | |
tree | ca5e810b07ed69b266f5df78df8a54b482bc86a0 | |
parent | 902b3c26c752aece62aac3feda5a7c0c6d995d3d (diff) | |
download | bitbake-fd40c85cb292f7c6c6a302c11d2600697d9dee09.tar.gz |
Search up the directory tree for bblayers.conf
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r-- | lib/bb/cooker.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 940eebee0..bc86632c0 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -521,14 +521,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) @@ -576,6 +585,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: |