diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2012-05-03 06:27:12 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-06 09:55:46 +0100 |
| commit | 23d149856d6e117cc6308a5beb5c843fcac79842 (patch) | |
| tree | ffdae5dac10112e8728b7e1c8773b2c9bb495a38 | |
| parent | 7b078123b78805b5f973b453a07808cdcfa0ae36 (diff) | |
| download | poky-23d149856d6e117cc6308a5beb5c843fcac79842.tar.gz | |
terminal.bbclass, oe-buildenv-internal: pass SCREENDIR environment variable
Some versions of the screen utility provided from the host OS vendor
write the socket directory to $HOME/.screen. When using a shared home
directory across many servers, one sets the SCREENDIR environment
variable to avoid collisions in the shared home directory. This
results in problems launching a devshell where it is not entirely
obvious what happened because the SCREENDIR environment variable
got stripped from the environment prior to setting up the screen
in detached mode.
Example:
% bitbake -c devshell busybox
# ...Please connect in another terminal with "screen -r devshell"
% screen -r devshell
There is no screen to be resumed matching devshell.
The temporary work around was to do something like:
sh -c "unset SCREENDIR; screen -r devshell"
This patch adds SCREENDIR to the white list to ensure screen
works properly on systems where a developer needs to use
the SCREENDIR with shared home directories.
(From OE-Core rev: 5568a8f5a1c65bae021b2e36d735d3153acc6d72)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/terminal.bbclass | 2 | ||||
| -rwxr-xr-x | scripts/oe-buildenv-internal | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index ca28bd24f2..3cfc84b444 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass | |||
| @@ -4,7 +4,7 @@ OE_TERMINAL[choices] = 'auto none \ | |||
| 4 | ${@" ".join(o.name \ | 4 | ${@" ".join(o.name \ |
| 5 | for o in oe.terminal.prioritized())}' | 5 | for o in oe.terminal.prioritized())}' |
| 6 | 6 | ||
| 7 | OE_TERMINAL_EXPORTS = 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY EXTRA_OEMAKE' | 7 | OE_TERMINAL_EXPORTS = 'XAUTHORITY SHELL DBUS_SESSION_BUS_ADDRESS DISPLAY EXTRA_OEMAKE SCREENDIR' |
| 8 | OE_TERMINAL_EXPORTS[type] = 'list' | 8 | OE_TERMINAL_EXPORTS[type] = 'list' |
| 9 | 9 | ||
| 10 | XAUTHORITY ?= "${HOME}/.Xauthority" | 10 | XAUTHORITY ?= "${HOME}/.Xauthority" |
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 14e728d6b4..9de7b05108 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal | |||
| @@ -70,4 +70,4 @@ unset BITBAKEDIR | |||
| 70 | # Used by the runqemu script | 70 | # Used by the runqemu script |
| 71 | export BUILDDIR | 71 | export BUILDDIR |
| 72 | export PATH | 72 | export PATH |
| 73 | export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER" | 73 | export BB_ENV_EXTRAWHITE="MACHINE DISTRO TCMODE TCLIBC http_proxy ftp_proxy https_proxy all_proxy ALL_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY SDKMACHINE BB_NUMBER_THREADS PARALLEL_MAKE GIT_PROXY_COMMAND GIT_PROXY_IGNORE SOCKS5_PASSWD SOCKS5_USER SCREENDIR" |