summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-14 16:25:52 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-17 17:42:19 +0000
commitf39e75ddefe783ffc226d916d6617c794fd1e738 (patch)
tree3e18a3aacd7ef6ccd1bd97d64de4ffc694490094 /bitbake
parent1e548a7fc735e55d411e3c529e1fcf8ded626156 (diff)
downloadpoky-f39e75ddefe783ffc226d916d6617c794fd1e738.tar.gz
bitbake: data: Ensure emit_func honours vardeps flag
Currently, calling a shell function using exec_func may result in dependent functions being missing, if the shell parser can't detect the dependency, even if it was specified with the vardeps flag. This patch ensures the function looks at the flag and considers it when deciding which other functions need to be output. [YOCTO #3561] (Bitbake rev: a906c94328b040d5076571bd593b57be7ee403a5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/data.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index dc5a425d1c..478a482d88 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -260,6 +260,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
260 260
261 emit_var(func, o, d, False) and o.write('\n') 261 emit_var(func, o, d, False) and o.write('\n')
262 newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True)) 262 newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True))
263 newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
263 seen = set() 264 seen = set()
264 while newdeps: 265 while newdeps:
265 deps = newdeps 266 deps = newdeps