summaryrefslogtreecommitdiff
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2010-12-10 15:30:30 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-14 22:36:19 +0000
commit80e6408b9f0a07e192696a2c2d371b258b4b187d (patch)
treee4a3c12b4855644fe11991952f98a75871727e9a /bitbake
parenta52e4063f4da3ac377959bbd1bea425c9a466df9 (diff)
downloadopenembedded-core-80e6408b9f0a07e192696a2c2d371b258b4b187d.tar.gz
openembedded-core-80e6408b9f0a07e192696a2c2d371b258b4b187d.tar.bz2
openembedded-core-80e6408b9f0a07e192696a2c2d371b258b4b187d.tar.xz
openembedded-core-80e6408b9f0a07e192696a2c2d371b258b4b187d.zip
bitbake: add optional expansion to getVarFlag()
Add a parameter to getVarFlag() to auto-expand the value of the flag. This makes getVarFlag() more consistent with getVar(), and allows expansion of vardeps and vardepsexclude (which has been done in this commit). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data.py4
-rw-r--r--bitbake/lib/bb/data_smart.py9
2 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 0c95ebb31..0aa8b404c 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 c8cd8f873..30f9cbc2d 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)