diff options
author | Anders Darander <anders@chargestorm.se> | 2014-01-10 15:59:01 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-10 15:16:52 +0000 |
commit | 8172f24b62ed65cb7267b13b01024c1b1e891119 (patch) | |
tree | fb29e9582127b47cc7544121c832a0758b72668c | |
parent | fef870956cb7446c93901d457d0026202c2a6317 (diff) | |
download | poky-8172f24b62ed65cb7267b13b01024c1b1e891119.tar.gz |
terminal.bbclass: do not export PS1
With a complex PS1 setup, PS1 might not have all characters correctly escaped
when terminal.bbclass writes the export. This caused the run.do_terminal.PID to
terminate, making it impossible to use the devshell.
As the spawned shell will parse e.g. .bashrc (or whatever rc-file is being
used), PS1 will be reset in the devshell.
(From OE-Core rev: a5e6926cd409140d16391c72316da00ffbfe5429)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/terminal.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 774f0559fb..e577c6d594 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass | |||
@@ -64,6 +64,10 @@ def oe_terminal(command, title, d): | |||
64 | envdata.setVar(key, str(value)) | 64 | envdata.setVar(key, str(value)) |
65 | envdata.setVarFlag(key, 'export', 1) | 65 | envdata.setVarFlag(key, 'export', 1) |
66 | 66 | ||
67 | # A complex PS1 might need more escaping of chars. | ||
68 | # Lets not export PS1 instead. | ||
69 | envdata.delVar("PS1") | ||
70 | |||
67 | # Replace command with an executable wrapper script | 71 | # Replace command with an executable wrapper script |
68 | command = emit_terminal_func(command, envdata, d) | 72 | command = emit_terminal_func(command, envdata, d) |
69 | 73 | ||