mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake/cooker.py: Fix handling of extra configuration files

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2009-12-11 12:48:49 +00:00
parent c02e38901b
commit cb8684f9bc
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,10 +62,10 @@ class BBCooker:
bb.data.inheritFromOS(self.configuration.data)
for f in self.configuration.file:
self.parseConfigurationFile( f )
# Add conf/bitbake.conf to the list of configuration files to read
self.configuration.file.append( os.path.join( "conf", "bitbake.conf" ) )
self.parseConfigurationFile( os.path.join( "conf", "bitbake.conf" ) )
self.parseConfigurationFile(self.configuration.file)
if not self.configuration.cmd:
self.configuration.cmd = bb.data.getVar("BB_DEFAULT_TASK", self.configuration.data) or "build"
@@ -385,9 +385,10 @@ class BBCooker:
shell.start( self )
sys.exit( 0 )
def parseConfigurationFile( self, afile ):
def parseConfigurationFile( self, afiles ):
try:
self.configuration.data = bb.parse.handle( afile, self.configuration.data )
for afile in afiles:
self.configuration.data = bb.parse.handle( afile, self.configuration.data )
# Handle any INHERITs and inherit the base class
inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split()