1 files changed, 12 insertions, 2 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 7a19740cc8..613654db85 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -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: