summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-02-23 11:55:43 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-22 14:56:16 +0000
commitd8b12d4eea4d03c2d8870be1a4abd9c8eaeb5b3d (patch)
treea927ce81d50ba63e0b10d0c3028e9c20e438c1ab
parent73a12b91847fc70c36da3fd57485e9f3529efe90 (diff)
downloadpoky-d8b12d4eea4d03c2d8870be1a4abd9c8eaeb5b3d.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. (Bitbake rev: c7d038d404afaf4ce3735af5134163759da6f6ef) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 1ba81886a7..ea3478ce3a 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -152,8 +152,7 @@ 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 multi = data.getVar('BBCLASSEXTEND', d, 1) 155 if data.getVar('BBCLASSEXTEND', d, 1):
156 if multi:
157 based = bb.data.createCopy(d) 156 based = bb.data.createCopy(d)
158 else: 157 else:
159 based = d 158 based = d
@@ -163,7 +162,7 @@ def handle(fn, d, include):
163 bb.data.setVar("__SKIPPED", True, based) 162 bb.data.setVar("__SKIPPED", True, based)
164 darray = {"": based} 163 darray = {"": based}
165 164
166 for cls in (multi or "").split(): 165 for cls in (data.getVar('BBCLASSEXTEND', based, 1) or "").split():
167 pn = data.getVar('PN', d, True) 166 pn = data.getVar('PN', d, True)
168 based = bb.data.createCopy(d) 167 based = bb.data.createCopy(d)
169 data.setVar('PN', pn + '-' + cls, based) 168 data.setVar('PN', pn + '-' + cls, based)