diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-14 16:18:33 +0100 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-08-16 10:39:41 +0100 |
| commit | 88866d93b1a99a921d390044a8399c3ef24dc977 (patch) | |
| tree | e1ca7a710b1bf31c3e99e7fd8bcf878e7aa916d2 /meta/classes/terminal.bbclass | |
| parent | acf46cb2eb03c2ed3aadd7858044ba2837a83292 (diff) | |
| download | openembedded-core-88866d93b1a99a921d390044a8399c3ef24dc977.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.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta/classes/terminal.bbclass')
| -rw-r--r-- | meta/classes/terminal.bbclass | 4 |
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): envdata.setVar(key, str(value)) envdata.setVarFlag(key, 'export', 1) + # LD_PRELOAD of pseudo will cause problems if this is a fakeroot task + # and we shouldn't be exporting it anyway + envdata.delVar('LD_PRELOAD') + # Replace command with an executable wrapper script command = emit_terminal_func(command, envdata, d) |