diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-01 14:43:54 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-03 16:25:20 +0000 |
commit | ade351e2f4c3693d4c2ecf3891899c2dcd082491 (patch) | |
tree | 5087685a70305a6d7792f2e622fca7654b6d0ced /bitbake-dev | |
parent | 28fd9dadbdf842d5db32e893be85068f9b2b114a (diff) | |
download | poky-ade351e2f4c3693d4c2ecf3891899c2dcd082491.tar.gz |
bitbake: Add in code to support the BBCLASSEXTEND variable. Virtual native/sdk recipes then become possible
Diffstat (limited to 'bitbake-dev')
-rwxr-xr-x | bitbake-dev/bin/bitdoc | 2 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bitbake-dev/bin/bitdoc b/bitbake-dev/bin/bitdoc index 3bcc9b344b..4940f660a6 100755 --- a/bitbake-dev/bin/bitdoc +++ b/bitbake-dev/bin/bitdoc | |||
@@ -453,6 +453,8 @@ def main(): | |||
453 | except bb.parse.ParseError: | 453 | except bb.parse.ParseError: |
454 | bb.fatal( "Unable to parse %s" % config_file ) | 454 | bb.fatal( "Unable to parse %s" % config_file ) |
455 | 455 | ||
456 | if isinstance(documentation, dict): | ||
457 | documentation = documentation[""] | ||
456 | 458 | ||
457 | # Assuming we've the file loaded now, we will initialize the 'tree' | 459 | # Assuming we've the file loaded now, we will initialize the 'tree' |
458 | doc = Documentation() | 460 | doc = Documentation() |
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 06f3395d7a..d19cef328d 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
@@ -628,13 +628,10 @@ class BBCooker: | |||
628 | fn = self.matchFile(buildfile) | 628 | fn = self.matchFile(buildfile) |
629 | self.buildSetVars() | 629 | self.buildSetVars() |
630 | 630 | ||
631 | # Load data into the cache for fn | 631 | # Load data into the cache for fn and parse the loaded cache data |
632 | self.bb_cache = bb.cache.init(self) | 632 | self.bb_cache = bb.cache.init(self) |
633 | self.bb_cache.loadData(fn, self.configuration.data) | ||
634 | |||
635 | # Parse the loaded cache data | ||
636 | self.status = bb.cache.CacheData() | 633 | self.status = bb.cache.CacheData() |
637 | self.bb_cache.handle_data(fn, self.status) | 634 | self.bb_cache.loadData(fn, self.configuration.data, self.status) |
638 | 635 | ||
639 | # Tweak some variables | 636 | # Tweak some variables |
640 | item = self.bb_cache.getVar('PN', fn, True) | 637 | item = self.bb_cache.getVar('PN', fn, True) |