diff options
Diffstat (limited to 'bitbake-dev/lib/bb')
-rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 4 | ||||
-rw-r--r-- | bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 8eb1a410f2..1531808613 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
@@ -86,6 +86,10 @@ class BBCooker: | |||
86 | 86 | ||
87 | self.configuration.data = bb.data.init() | 87 | self.configuration.data = bb.data.init() |
88 | 88 | ||
89 | def parseConfiguration(self): | ||
90 | |||
91 | bb.data.inheritFromOS(self.configuration.data) | ||
92 | |||
89 | for f in self.configuration.file: | 93 | for f in self.configuration.file: |
90 | self.parseConfigurationFile( f ) | 94 | self.parseConfigurationFile( f ) |
91 | 95 | ||
diff --git a/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py b/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py index e6488bbe11..f8a49689e2 100644 --- a/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake-dev/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -118,7 +118,6 @@ def handle(fn, data, include = 0): | |||
118 | init(data) | 118 | init(data) |
119 | 119 | ||
120 | if include == 0: | 120 | if include == 0: |
121 | bb.data.inheritFromOS(data) | ||
122 | oldfile = None | 121 | oldfile = None |
123 | else: | 122 | else: |
124 | oldfile = bb.data.getVar('FILE', data) | 123 | oldfile = bb.data.getVar('FILE', data) |