summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-02-23 11:55:43 -0700
committerChris Larson <chris_larson@mentor.com>2010-02-23 12:47:20 -0700
commitc7d038d404afaf4ce3735af5134163759da6f6ef (patch)
treec3e649ad98ebe7b2c70d128b80793f642ddd0287
parent641e6cf3ec3ab4d26929cf4d2a3704ff07eed4d6 (diff)
downloadbitbake-c7d038d404afaf4ce3735af5134163759da6f6ef.tar.gz
Re-getVar BBCLASSEXTEND after finalise()
This ensures that an anonymous python function is able to manipulate the BBCLASSEXTEND contents, and, therefore, amend.inc files are able to add to it. Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--lib/bb/parse/parse_py/BBHandler.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bb/parse/parse_py/BBHandler.py b/lib/bb/parse/parse_py/BBHandler.py
index 1ba81886a..ea3478ce3 100644
--- a/lib/bb/parse/parse_py/BBHandler.py
+++ b/lib/bb/parse/parse_py/BBHandler.py
@@ -152,8 +152,7 @@ def handle(fn, d, include):
classes.remove(__classname__)
else:
if include == 0:
- multi = data.getVar('BBCLASSEXTEND', d, 1)
- if multi:
+ if data.getVar('BBCLASSEXTEND', d, 1):
based = bb.data.createCopy(d)
else:
based = d
@@ -163,7 +162,7 @@ def handle(fn, d, include):
bb.data.setVar("__SKIPPED", True, based)
darray = {"": based}
- for cls in (multi or "").split():
+ for cls in (data.getVar('BBCLASSEXTEND', based, 1) or "").split():
pn = data.getVar('PN', d, True)
based = bb.data.createCopy(d)
data.setVar('PN', pn + '-' + cls, based)