summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-17 12:15:48 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:52 +0000
commitd951aa40a04caec7303c37641e4ea1f9c47e8893 (patch)
treefa1aba21b3d3a1f80992aaabc4c3905d3b9e0179 /bitbake
parent717f13d63cb904ce48533d3f1b2b00d278741f6f (diff)
downloadpoky-d951aa40a04caec7303c37641e4ea1f9c47e8893.tar.gz
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')
-rw-r--r--bitbake/lib/bb/cooker.py14
-rw-r--r--bitbake/lib/bb/data_smart.py21
2 files changed, 22 insertions, 13 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 548273380f..9c48194a61 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -502,19 +502,7 @@ class BBCooker:
502 parselog.debug(2, "Adding layer %s", layer) 502 parselog.debug(2, "Adding layer %s", layer)
503 bb.data.setVar('LAYERDIR', layer, data) 503 bb.data.setVar('LAYERDIR', layer, data)
504 data = _parse(os.path.join(layer, "conf", "layer.conf"), data) 504 data = _parse(os.path.join(layer, "conf", "layer.conf"), data)
505 505 data.expandVarref('LAYERDIR')
506 # XXX: Hack, relies on the local keys of the datasmart
507 # instance being stored in the 'dict' attribute and makes
508 # assumptions about how variable expansion works, but
509 # there's no better way to force an expansion of a single
510 # variable across the datastore today, and this at least
511 # lets us reference LAYERDIR without having to immediately
512 # eval all our variables that use it.
513 for key in data.dict:
514 if key != "_data":
515 value = data.getVar(key, False)
516 if value and "${LAYERDIR}" in value:
517 data.setVar(key, value.replace("${LAYERDIR}", layer))
518 506
519 bb.data.delVar('LAYERDIR', data) 507 bb.data.delVar('LAYERDIR', data)
520 508
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 16270461a4..ca72449b75 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -361,6 +361,27 @@ class DataSmart(MutableMapping):
361 361
362 return data 362 return data
363 363
364 def expandVarref(self, variable, parents=False):
365 """Find all references to variable in the data and expand it
366 in place, optionally descending to parent datastores."""
367
368 if parents:
369 keys = iter(self)
370 else:
371 keys = self.localkeys()
372
373 ref = '${%s}' % variable
374 value = self.getVar(variable, False)
375 for key in keys:
376 referrervalue = self.getVar(key, False)
377 if ref in referrervalue:
378 self.setVar(key, referrervalue.replace(ref, value))
379
380 def localkeys(self):
381 for key in self.dict:
382 if key != '_data':
383 yield key
384
364 def __iter__(self): 385 def __iter__(self):
365 seen = set() 386 seen = set()
366 def _keys(d): 387 def _keys(d):