aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-13 09:26:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-13 09:42:03 +0000
commit67d7ea2db8bce766daf3419feae3cd8045af5114 (patch)
tree264722f1f6aacc74b147992db4803e77ffea6a75 /meta/classes
parenta47e64d985a610535449730806651f5bfd75d9ec (diff)
downloadopenembedded-core-contrib-67d7ea2db8bce766daf3419feae3cd8045af5114.tar.gz
openembedded-core-contrib-67d7ea2db8bce766daf3419feae3cd8045af5114.tar.bz2
openembedded-core-contrib-67d7ea2db8bce766daf3419feae3cd8045af5114.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/terminal.bbclass5
1 files changed, 5 insertions, 0 deletions
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")