aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-12-17 12:15:48 -0700
committerChris Larson <chris_larson@mentor.com>2010-12-17 12:15:54 -0700
commit40778a6e9e82c7ea4673a74fc19574430fa63e8d (patch)
tree98b610946f3b86cfa911e4fb2a2e224a3f60ae37
parent2bc893dc407bf608cac7e12673161b75b712da83 (diff)
downloadbitbake-40778a6e9e82c7ea4673a74fc19574430fa63e8d.tar.gz
Move LAYERDIR expansion hack into DataSmart
Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--TODO2
-rw-r--r--lib/bb/cooker.py14
-rw-r--r--lib/bb/data_smart.py21
3 files changed, 22 insertions, 15 deletions
diff --git a/TODO b/TODO
index e97842753..cfc9ee964 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
- Reimplement the interactive mode as a proper ui
-- Move the LAYERDIR expansion hack into DataSmart, as that's where code that
- depends upon its internals belongs
- Continue dropping fatal/SystemExit/sys.exit usage in favor of raising
appropriate exceptions
- Continue pylint / pyflakes / pychecker / pep8 fixups
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 68d07cb14..c8ca09980 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -500,19 +500,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)
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 7a81bd14d..a766f3241 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -335,6 +335,27 @@ class DataSmart(MutableMapping):
return data
+ def expandVarref(self, variable, parents=False):
+ """Find all references to variable in the data and expand it
+ in place, optionally descending to parent datastores."""
+
+ if parents:
+ keys = iter(self)
+ else:
+ keys = self.localkeys()
+
+ ref = '${%s}' % variable
+ value = self.getVar(variable, False)
+ for key in keys:
+ referrervalue = self.getVar(key, False)
+ if ref in referrervalue:
+ self.setVar(key, referrervalue.replace(ref, value))
+
+ def localkeys(self):
+ for key in self.dict:
+ if key != '_data':
+ yield key
+
def __iter__(self):
seen = set()
def _keys(d):