sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

cooker: simplify self.configuration.data vs data usage 

(Bitbake rev: 87112adee4e8add0a97ff8be8311d9afe202412d)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chris Larson 2011-02-23 10:17:53 -07:00 committed by Richard Purdie
parent 87dfc1466d
commit 88f4ba28bc
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -670,23 +670,22 @@ class BBCooker:
data = _parse(os.path.join("conf", "bitbake.conf"), data)
self.configuration.data = data
# Handle any INHERITs and inherit the base class
inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split()
inherits = ["base"] + (data.getVar('INHERIT', True) or "").split()
for inherit in inherits:
self.configuration.data = _parse(os.path.join('classes', '%s.bbclass' % inherit), self.configuration.data, True )
data = _parse(os.path.join('classes', '%s.bbclass' % inherit), data, True)
# Nomally we only register event handlers at the end of parsing .bb files
# We register any handlers we've found so far here...
for var in bb.data.getVar('__BBHANDLERS', self.configuration.data) or []:
bb.event.register(var, bb.data.getVar(var, self.configuration.data))
for var in bb.data.getVar('__BBHANDLERS', data) or []:
bb.event.register(var, bb.data.getVar(var, data))
if bb.data.getVar("BB_WORKERCONTEXT", self.configuration.data) is None:
bb.fetch.fetcher_init(self.configuration.data)
bb.codeparser.parser_cache_init(self.configuration.data)
if data.getVar("BB_WORKERCONTEXT", False) is None:
bb.fetch.fetcher_init(data)
bb.codeparser.parser_cache_init(data)
bb.parse.init_parser(data)
bb.event.fire(bb.event.ConfigParsed(), self.configuration.data)
bb.event.fire(bb.event.ConfigParsed(), data)
self.configuration.data = data
def handleCollections( self, collections ):
"""Handle collections"""