diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a6f3befe15..369444b9b3 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -646,15 +646,18 @@ class BBCooker: | |||
646 | else: | 646 | else: |
647 | shell.start( self ) | 647 | shell.start( self ) |
648 | 648 | ||
649 | def _findLayerConf(self): | 649 | def _findConfigFile(self, configfile): |
650 | path = os.getcwd() | 650 | path = os.getcwd() |
651 | while path != "/": | 651 | while path != "/": |
652 | bblayers = os.path.join(path, "conf", "bblayers.conf") | 652 | confpath = os.path.join(path, "conf", configfile) |
653 | if os.path.exists(bblayers): | 653 | if os.path.exists(confpath): |
654 | return bblayers | 654 | return confpath |
655 | 655 | ||
656 | path, _ = os.path.split(path) | 656 | path, _ = os.path.split(path) |
657 | 657 | ||
658 | def _findLayerConf(self): | ||
659 | return self._findConfigFile("bblayers.conf") | ||
660 | |||
658 | def parseConfigurationFiles(self, files): | 661 | def parseConfigurationFiles(self, files): |
659 | data = self.configuration.data | 662 | data = self.configuration.data |
660 | bb.parse.init_parser(data) | 663 | bb.parse.init_parser(data) |