summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/devshell.bbclass19
-rw-r--r--meta/classes/terminal.bbclass5
2 files changed, 23 insertions, 1 deletions
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index ddb6e55303..a780118a12 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -1,10 +1,27 @@
1inherit terminal 1inherit terminal
2 2
3DEVSHELL = "${SHELL}"
4
3python do_devshell () { 5python do_devshell () {
4 oe_terminal(d.getVar('SHELL', True), 'OpenEmbedded Developer Shell', d) 6 oe_terminal(d.getVar('DEVSHELL', True), 'OpenEmbedded Developer Shell', d)
5} 7}
6 8
7addtask devshell after do_patch 9addtask devshell after do_patch
8 10
9do_devshell[dirs] = "${S}" 11do_devshell[dirs] = "${S}"
10do_devshell[nostamp] = "1" 12do_devshell[nostamp] = "1"
13
14# devshell and fakeroot/pseudo need careful handling since only the final
15# command should run under fakeroot emulation, any X connection should
16# be done as the normal user. We therfore carefully construct the envionment
17# manually
18python () {
19 if d.getVarFlag("do_devshell", "fakeroot"):
20 d.prependVar("DEVSHELL", "pseudo ")
21 fakeenv = d.getVar("FAKEROOTENV", True).split()
22 for f in fakeenv:
23 k = f.split("=")
24 d.setVar(k[0], k[1])
25 d.appendVar("OE_TERMINAL_EXPORTS", " " + k[0])
26 d.delVarFlag("do_devshell", "fakeroot")
27}
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index d5a6277896..8cebad4162 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -25,6 +25,11 @@ def oe_terminal(command, title, d):
25 if value is not None: 25 if value is not None:
26 os.environ[export] = str(value) 26 os.environ[export] = str(value)
27 env[export] = str(value) 27 env[export] = str(value)
28 if export == "PSEUDO_DISABLED":
29 if "PSEUDO_UNLOAD" in os.environ:
30 del os.environ["PSEUDO_UNLOAD"]
31 if "PSEUDO_UNLOAD" in env:
32 del env["PSEUDO_UNLOAD"]
28 33
29 # Add in all variables from the user's original environment which 34 # Add in all variables from the user's original environment which
30 # haven't subsequntly been set/changed 35 # haven't subsequntly been set/changed