diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-08 16:37:26 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:09:51 +0000 |
commit | 4d4baf20487271aa83bd9f1a778e4ea9af6f6681 (patch) | |
tree | 2ba6b5421b125aa15c19fd6366cb21348b4ab2bf | |
parent | dca5d82830ef2838439e5272da9dac1f28954cf1 (diff) | |
download | bitbake-4d4baf20487271aa83bd9f1a778e4ea9af6f6681.tar.gz |
data: Handle BASH_FUNC shellshock implication
The shellshock patches changed the way bash functions are exported.
Unfortunately different distros used slightly different formats,
Fedora went with BASH_FUNC_XXX()=() { echo foo; } and Ubuntu went with
BASH_FUNC_foo%%=() { echo foo; }.
The former causes errors in dealing with out output from emit_env,
the functions are not exported in either case any more.
This patch handles things so the functions work as expected in either
case.
[YOCTO #6880]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/data.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/bb/data.py b/lib/bb/data.py index 91b1eb129..eb628c7df 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -219,6 +219,13 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): val = str(val) + if varExpanded.startswith("BASH_FUNC_"): + varExpanded = varExpanded[10:-2] + val = val[3:] # Strip off "() " + o.write("%s() %s\n" % (varExpanded, val)) + o.write("export -f %s\n" % (varExpanded)) + return 1 + if func: # NOTE: should probably check for unbalanced {} within the var o.write("%s() {\n%s\n}\n" % (varExpanded, val)) |