summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Tollerton <rich.tollerton@ni.com>2015-04-09 20:21:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-11 15:27:21 (GMT)
commitf1bb6acacc854f4d585e9a848aac82e7381313b9 (patch)
treee7e61d70c49ff5f3ab3f0b0e438b5a5914c08cdb
parent7effa6edd01430c7b41f1f06044a2c8bc4341965 (diff)
downloadpoky-f1bb6acacc854f4d585e9a848aac82e7381313b9.tar.gz
bitbake: data.py: fixes bad substitution when running devshell
Running bitbake inside make results in the exported environment variable MAKEOVERRIDES="${-*-command-variables-*-}", which the shell chokes on when trying to expand it. But of course, it probably shouldn't have been trying to expand it in the first place -- so just escape the dollar sign. (Bitbake rev: 18cd0ce6a55c9065c3f1bf223b47d817b5efcd8f) (Bitbake rev: 012fb876c1cf0b3aeee3c8c168af0a8947518246) Signed-off-by: Richard Tollerton <rich.tollerton@ni.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 db938be..99bac9a 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -231,6 +231,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False):
231 # to a shell, we need to escape the quotes in the var 231 # to a shell, we need to escape the quotes in the var
232 alter = re.sub('"', '\\"', val) 232 alter = re.sub('"', '\\"', val)
233 alter = re.sub('\n', ' \\\n', alter) 233 alter = re.sub('\n', ' \\\n', alter)
234 alter = re.sub('\\$', '\\\\$', alter)
234 o.write('%s="%s"\n' % (varExpanded, alter)) 235 o.write('%s="%s"\n' % (varExpanded, alter))
235 return 0 236 return 0
236 237