From 67d7ea2db8bce766daf3419feae3cd8045af5114 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 13 Mar 2017 09:26:54 +0000 Subject: terminal: Use original PATH for terminals Now that we filter out PATH to only the utilities we rely upon, the devshel terminal was broken since it can no longer find the terminals. Even if we fix that, the user couldn't access any of their commands within devshell which somewhat defeats its purpose. Add the original PATH back to the environment to restore that behaviour since this is more in line with user expectations and it wouldn't be possible (or desireable) to whitelist all the commands a user might want to use from the shell. Signed-off-by: Richard Purdie --- meta/classes/terminal.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 62409c0815..a27e10c6ec 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass @@ -66,6 +66,11 @@ def oe_terminal(command, title, d): envdata.setVar(key, str(value)) envdata.setVarFlag(key, 'export', '1') + # Use original PATH as a fallback + path = d.getVar('PATH') + ":" + origbbenv.getVar('PATH') + os.environ['PATH'] = path + envdata.setVar('PATH', path) + # A complex PS1 might need more escaping of chars. # Lets not export PS1 instead. envdata.delVar("PS1") -- cgit 1.2.3-korg