summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-08-14 16:18:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-16 11:18:06 +0100
commit9c70e442c7b8697102a24fc9b95a5dd1b1643d1f (patch)
treec94f8664b1333dec79c5f846e857f3a3e61bb4b1
parentce2c85de2910c8746ccfed6b7e17bd9e2b78d3d9 (diff)
downloadpoky-9c70e442c7b8697102a24fc9b95a5dd1b1643d1f.tar.gz
classes/terminal: fix pseudo exiting when launching devshell
In dylan, since the entire bitbake process is run under pseudo, LD_PRELOAD is set when we collect BB_ORIGENV and thus when we construct the devshell environment from the latter, LD_PRELOAD is included. However, for a fakeroot task we explicitly run the devshell under pseudo (e.g. "pseudo /bin/bash"), and if LD_PRELOAD is set to preload libpseudo.so when pseudo is run, it seems to exit immediately without error. Since LD_PRELOAD shouldn't be exported anyway, exclude this from the environment so it doesn't prevent running the shell. (From OE-Core rev: 88866d93b1a99a921d390044a8399c3ef24dc977) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/terminal.bbclass4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index ae338e9f57..96d2d2acc0 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -62,6 +62,10 @@ def oe_terminal(command, title, d):
62 envdata.setVar(key, str(value)) 62 envdata.setVar(key, str(value))
63 envdata.setVarFlag(key, 'export', 1) 63 envdata.setVarFlag(key, 'export', 1)
64 64
65 # LD_PRELOAD of pseudo will cause problems if this is a fakeroot task
66 # and we shouldn't be exporting it anyway
67 envdata.delVar('LD_PRELOAD')
68
65 # Replace command with an executable wrapper script 69 # Replace command with an executable wrapper script
66 command = emit_terminal_func(command, envdata, d) 70 command = emit_terminal_func(command, envdata, d)
67 71