diff options
author | Richard Tollerton <rich.tollerton@ni.com> | 2015-04-09 15:21:49 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-11 16:27:19 +0100 |
commit | c59e3bd26d863723af7ba5e16570b091ef7cdc13 (patch) | |
tree | 01d79223f6c743cfc1049bb366e46526469332e9 /bitbake/lib | |
parent | c18e52c0c868253e40bb25734f742edbd764033d (diff) | |
download | poky-c59e3bd26d863723af7ba5e16570b091ef7cdc13.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: 34226a9e02f319a7547967bbdaca3ca918927dd1)
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>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/data.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index eb628c7df3..82eefef1a6 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -238,6 +238,7 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): | |||
238 | # to a shell, we need to escape the quotes in the var | 238 | # to a shell, we need to escape the quotes in the var |
239 | alter = re.sub('"', '\\"', val) | 239 | alter = re.sub('"', '\\"', val) |
240 | alter = re.sub('\n', ' \\\n', alter) | 240 | alter = re.sub('\n', ' \\\n', alter) |
241 | alter = re.sub('\\$', '\\\\$', alter) | ||
241 | o.write('%s="%s"\n' % (varExpanded, alter)) | 242 | o.write('%s="%s"\n' % (varExpanded, alter)) |
242 | return 0 | 243 | return 0 |
243 | 244 | ||