sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: bitbake/utils: Improve environment handling to allow UIs access to original environment 

We need to empty out the environment whilst we build the cooker but
we need the environment for the UIs since hob uses DISPLAY and other
session variables.

This patch adapts the utils functions to return removed environment
components so we can reinject them for use by the UI, allowing hob
to work again.

(Bitbake rev: fc330d810099c57fefd4e706159a73ad8401d97c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-02-11 11:00:45 +00:00
parent 20b4dcace2
commit b6d8f96ee5
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake/bin/bitbake
View File

@ -229,10 +229,8 @@ Default BBFILES are the .bb files in the current directory.""")
# Before we start modifying the environment we should take a pristine # Before we start modifying the environment we should take a pristine
# copy for possible later use # copy for possible later use
initialenv = os.environ.copy() initialenv = os.environ.copy()
# Clear away any spurious environment variables. But don't wipe the # Clear away any spurious environment variables while we stoke up the cooker
# environment totally. This is necessary to ensure the correct operation cleanedvars = bb.utils.clean_environment()
# of the UIs (e.g. for DISPLAY, etc.)
bb.utils.clean_environment()
server = server.BitBakeServer() server = server.BitBakeServer()
if configuration.bind: if configuration.bind:
@ -258,6 +256,10 @@ Default BBFILES are the .bb files in the current directory.""")
# Setup a connection to the server (cooker) # Setup a connection to the server (cooker)
server_connection = server.establishConnection() server_connection = server.establishConnection()
# Restore the environment in case the UI needs it
for k in cleanedvars:
os.environ[k] = cleanedvars[k]
try: try:
return server.launchUI(ui_main, server_connection.connection, server_connection.events) return server.launchUI(ui_main, server_connection.connection, server_connection.events)
finally: finally:

10
bitbake/lib/bb/utils.py
View File

@ -474,17 +474,17 @@ def filter_environment(good_vars):
are not known and may influence the build in a negative way. are not known and may influence the build in a negative way.
""" """
removed_vars = [] removed_vars = {}
for key in os.environ.keys(): for key in os.environ.keys():
if key in good_vars: if key in good_vars:
continue continue
removed_vars.append(key) removed_vars[key] = os.environ[key]
os.unsetenv(key) os.unsetenv(key)
del os.environ[key] del os.environ[key]
if len(removed_vars): if len(removed_vars):
logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars)) logger.debug(1, "Removed the following variables from the environment: %s", ", ".join(removed_vars.keys()))
return removed_vars return removed_vars
@ -509,7 +509,9 @@ def clean_environment():
""" """
if 'BB_PRESERVE_ENV' not in os.environ: if 'BB_PRESERVE_ENV' not in os.environ:
good_vars = approved_variables() good_vars = approved_variables()
filter_environment(good_vars) return filter_environment(good_vars)
return {}
def empty_environment(): def empty_environment():
""" """