diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 230afcb4bc..14ccfb59aa 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -62,10 +62,10 @@ class BBCooker: | |||
62 | 62 | ||
63 | bb.data.inheritFromOS(self.configuration.data) | 63 | bb.data.inheritFromOS(self.configuration.data) |
64 | 64 | ||
65 | for f in self.configuration.file: | 65 | # Add conf/bitbake.conf to the list of configuration files to read |
66 | self.parseConfigurationFile( f ) | 66 | self.configuration.file.append( os.path.join( "conf", "bitbake.conf" ) ) |
67 | 67 | ||
68 | self.parseConfigurationFile( os.path.join( "conf", "bitbake.conf" ) ) | 68 | self.parseConfigurationFile(self.configuration.file) |
69 | 69 | ||
70 | if not self.configuration.cmd: | 70 | if not self.configuration.cmd: |
71 | self.configuration.cmd = bb.data.getVar("BB_DEFAULT_TASK", self.configuration.data) or "build" | 71 | self.configuration.cmd = bb.data.getVar("BB_DEFAULT_TASK", self.configuration.data) or "build" |
@@ -385,9 +385,10 @@ class BBCooker: | |||
385 | shell.start( self ) | 385 | shell.start( self ) |
386 | sys.exit( 0 ) | 386 | sys.exit( 0 ) |
387 | 387 | ||
388 | def parseConfigurationFile( self, afile ): | 388 | def parseConfigurationFile( self, afiles ): |
389 | try: | 389 | try: |
390 | self.configuration.data = bb.parse.handle( afile, self.configuration.data ) | 390 | for afile in afiles: |
391 | self.configuration.data = bb.parse.handle( afile, self.configuration.data ) | ||
391 | 392 | ||
392 | # Handle any INHERITs and inherit the base class | 393 | # Handle any INHERITs and inherit the base class |
393 | inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split() | 394 | inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split() |