diff options
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/BBHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 4641c13d9c..262c883c95 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -152,30 +152,8 @@ def handle(fn, d, include): | |||
152 | classes.remove(__classname__) | 152 | classes.remove(__classname__) |
153 | else: | 153 | else: |
154 | if include == 0: | 154 | if include == 0: |
155 | safe_d = d | 155 | return ast.multi_finalize(fn, d) |
156 | d = bb.data.createCopy(safe_d) | 156 | |
157 | try: | ||
158 | ast.finalise(fn, d) | ||
159 | except bb.parse.SkipPackage: | ||
160 | bb.data.setVar("__SKIPPED", True, d) | ||
161 | darray = {"": d} | ||
162 | |||
163 | extended = bb.data.getVar("BBCLASSEXTEND", d, True) | ||
164 | if extended: | ||
165 | bb.data.setVar("BBCLASSEXTEND", extended, safe_d) | ||
166 | |||
167 | for cls in (extended or "").split(): | ||
168 | pn = data.getVar('PN', d, True) | ||
169 | variant_d = bb.data.createCopy(safe_d) | ||
170 | data.setVar('PN', pn + '-' + cls, variant_d) | ||
171 | inherit([cls], variant_d) | ||
172 | try: | ||
173 | ast.finalise(fn, variant_d) | ||
174 | except bb.parse.SkipPackage: | ||
175 | bb.data.setVar("__SKIPPED", True, variant_d) | ||
176 | darray[cls] = variant_d | ||
177 | return darray | ||
178 | |||
179 | if oldfile: | 157 | if oldfile: |
180 | bb.data.setVar("FILE", oldfile, d) | 158 | bb.data.setVar("FILE", oldfile, d) |
181 | 159 | ||