summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-02-23 17:17:53 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-08 19:38:26 (GMT)
commit88f4ba28bcc95b64940bd465793a3bb50abf0693 (patch)
tree616335fbd7c2caec56c384e6ee190af3329af132 /bitbake
parent87dfc1466d91e9d80b122691b965714fd10ab209 (diff)
downloadpoky-88f4ba28bcc95b64940bd465793a3bb50abf0693.tar.gz
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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 4f930ee..ad9af7b 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -670,23 +670,22 @@ class BBCooker:
670 670
671 data = _parse(os.path.join("conf", "bitbake.conf"), data) 671 data = _parse(os.path.join("conf", "bitbake.conf"), data)
672 672
673 self.configuration.data = data
674
675 # Handle any INHERITs and inherit the base class 673 # Handle any INHERITs and inherit the base class
676 inherits = ["base"] + (bb.data.getVar('INHERIT', self.configuration.data, True ) or "").split() 674 inherits = ["base"] + (data.getVar('INHERIT', True) or "").split()
677 for inherit in inherits: 675 for inherit in inherits:
678 self.configuration.data = _parse(os.path.join('classes', '%s.bbclass' % inherit), self.configuration.data, True ) 676 data = _parse(os.path.join('classes', '%s.bbclass' % inherit), data, True)
679 677
680 # Nomally we only register event handlers at the end of parsing .bb files 678 # Nomally we only register event handlers at the end of parsing .bb files
681 # We register any handlers we've found so far here... 679 # We register any handlers we've found so far here...
682 for var in bb.data.getVar('__BBHANDLERS', self.configuration.data) or []: 680 for var in bb.data.getVar('__BBHANDLERS', data) or []:
683 bb.event.register(var, bb.data.getVar(var, self.configuration.data)) 681 bb.event.register(var, bb.data.getVar(var, data))
684 682
685 if bb.data.getVar("BB_WORKERCONTEXT", self.configuration.data) is None: 683 if data.getVar("BB_WORKERCONTEXT", False) is None:
686 bb.fetch.fetcher_init(self.configuration.data) 684 bb.fetch.fetcher_init(data)
687 bb.codeparser.parser_cache_init(self.configuration.data) 685 bb.codeparser.parser_cache_init(data)
688 bb.parse.init_parser(data) 686 bb.parse.init_parser(data)
689 bb.event.fire(bb.event.ConfigParsed(), self.configuration.data) 687 bb.event.fire(bb.event.ConfigParsed(), data)
688 self.configuration.data = data
690 689
691 def handleCollections( self, collections ): 690 def handleCollections( self, collections ):
692 """Handle collections""" 691 """Handle collections"""