]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
data: Ensure emit_func honours vardeps flag
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 14 Dec 2012 16:25:52 +0000 (16:25 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 17 Dec 2012 17:41:54 +0000 (17:41 +0000)
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]

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
lib/bb/data.py

index dc5a425d1c76993af1c3e7a83808e65b6a13e441..478a482d881225ee4ee8465b4aa2f1cff1c8fef5 100644 (file)
@@ -260,6 +260,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
 
     emit_var(func, o, d, False) and o.write('\n')
     newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func, True))
+    newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
     seen = set()
     while newdeps:
         deps = newdeps