diff options
| author |   Anders Darander <anders@chargestorm.se> | 2014-01-10 15:59:01 +0100 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2014-01-26 14:08:27 +0800 |
| commit | a7d489f3341262b662e720170d64caf7092a956b (patch) | |
| tree | c96f7606f03d84ffde1d4200f711ad4cf8a9ae34 | |
| parent | bbf8f596ca51aa33bdb5b0d5664827d62408863c (diff) | |
| download | openembedded-core-a7d489f3341262b662e720170d64caf7092a956b.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 master rev: a5e6926cd409140d16391c72316da00ffbfe5429)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
| -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 efbc4eb9ae..290366600b 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass @@ -64,6 +64,10 @@ def oe_terminal(command, title, d): envdata.setVar(key, str(value)) envdata.setVarFlag(key, 'export', 1) + # A complex PS1 might need more escaping of chars. + # Lets not export PS1 instead. + envdata.delVar("PS1") + # Replace command with an executable wrapper script command = emit_terminal_func(command, envdata, d) |