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

Fix issues with BBCLASSEXTEND set by anonymous python, and rename some variables to improve code clarity 

(Bitbake rev: 3062e96181fe845cfd286990b0216888ddd3d228)

Signed-off-by: Chris Larson <clarson@kergoth.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Chris Larson 2010-03-01 18:45:15 -05:00 committed by Richard Purdie
parent 57044b9a62
commit 2f9e15afbe
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bitbake/lib/bb/parse/parse_py/BBHandler.py
View File

@ -152,26 +152,28 @@ def handle(fn, d, include):
classes.remove(__classname__)
else:
if include == 0:
if data.getVar('BBCLASSEXTEND', d, 1):
based = bb.data.createCopy(d)
else:
based = d
safe_d = d
d = bb.data.createCopy(safe_d)
try:
ast.finalise(fn, based)
ast.finalise(fn, d)
except bb.parse.SkipPackage:
bb.data.setVar("__SKIPPED", True, based)
darray = {"": based}
bb.data.setVar("__SKIPPED", True, d)
darray = {"": d}
for cls in (data.getVar('BBCLASSEXTEND', based, 1) or "").split():
extended = bb.data.getVar("BBCLASSEXTEND", d, True)
if extended:
bb.data.setVar("BBCLASSEXTEND", extended, safe_d)
for cls in (extended or "").split():
pn = data.getVar('PN', d, True)
based = bb.data.createCopy(d)
data.setVar('PN', pn + '-' + cls, based)
inherit([cls], based)
variant_d = bb.data.createCopy(safe_d)
data.setVar('PN', pn + '-' + cls, variant_d)
inherit([cls], variant_d)
try:
ast.finalise(fn, based)
ast.finalise(fn, variant_d)
except bb.parse.SkipPackage:
bb.data.setVar("__SKIPPED", True, based)
darray[cls] = based
bb.data.setVar("__SKIPPED", True, variant_d)
darray[cls] = variant_d
return darray
if oldfile: