diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-12-17 12:15:48 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:52 +0000 |
commit | d951aa40a04caec7303c37641e4ea1f9c47e8893 (patch) | |
tree | fa1aba21b3d3a1f80992aaabc4c3905d3b9e0179 /bitbake/lib/bb/cooker.py | |
parent | 717f13d63cb904ce48533d3f1b2b00d278741f6f (diff) | |
download | openembedded-core-d951aa40a04caec7303c37641e4ea1f9c47e8893.tar.gz openembedded-core-d951aa40a04caec7303c37641e4ea1f9c47e8893.tar.bz2 openembedded-core-d951aa40a04caec7303c37641e4ea1f9c47e8893.tar.xz openembedded-core-d951aa40a04caec7303c37641e4ea1f9c47e8893.zip |
Move LAYERDIR expansion hack into DataSmart
(Bitbake rev: 40778a6e9e82c7ea4673a74fc19574430fa63e8d)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 548273380..9c48194a6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -502,19 +502,7 @@ class BBCooker: parselog.debug(2, "Adding layer %s", layer) bb.data.setVar('LAYERDIR', layer, data) data = _parse(os.path.join(layer, "conf", "layer.conf"), data) - - # XXX: Hack, relies on the local keys of the datasmart - # instance being stored in the 'dict' attribute and makes - # assumptions about how variable expansion works, but - # there's no better way to force an expansion of a single - # variable across the datastore today, and this at least - # lets us reference LAYERDIR without having to immediately - # eval all our variables that use it. - for key in data.dict: - if key != "_data": - value = data.getVar(key, False) - if value and "${LAYERDIR}" in value: - data.setVar(key, value.replace("${LAYERDIR}", layer)) + data.expandVarref('LAYERDIR') bb.data.delVar('LAYERDIR', data) |