From: Anders Darander Date: Fri, 10 Jan 2014 14:59:01 +0000 (+0100) Subject: terminal.bbclass: do not export PS1 X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34899 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5e6926cd409140d16391c72316da00ffbfe5429;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Anders Darander Signed-off-by: Richard Purdie --- diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 774f0559fbe..e577c6d5943 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)