diff options
| -rw-r--r-- | bitbake/lib/bb/data.py | 4 | ||||
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 0c95ebb31b..0aa8b404cb 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py @@ -296,8 +296,8 @@ def build_dependencies(key, keys, shelldeps, d): parser = d.expandWithRefs(d.getVar(key, False), key) deps |= parser.references deps = deps | (keys & parser.execs) - deps |= set((d.getVarFlag(key, "vardeps") or "").split()) - deps -= set((d.getVarFlag(key, "vardepsexclude") or "").split()) + deps |= set((d.getVarFlag(key, "vardeps", True) or "").split()) + deps -= set((d.getVarFlag(key, "vardepsexclude", True) or "").split()) except: bb.note("Error expanding variable %s" % key) raise diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index c8cd8f8739..30f9cbc2d4 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -277,12 +277,15 @@ class DataSmart: self._makeShadowCopy(var) self.dict[var][flag] = flagvalue - def getVarFlag(self, var, flag): + def getVarFlag(self, var, flag, exp = False): local_var = self._findVar(var) + value = None if local_var: if flag in local_var: - return copy.copy(local_var[flag]) - return None + value = copy.copy(local_var[flag]) + if exp and value: + value = self.expand(value, None) + return value def delVarFlag(self, var, flag): local_var = self._findVar(var) |