diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-05 16:02:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-06 13:13:01 +0000 |
| commit | 6fecb1a3e02a91b4945f1d3e5faf72e9c129e833 (patch) | |
| tree | 75552a348fa5a3bdc7425a0095560e7cdc9e782c /bitbake | |
| parent | 1f192a7ade00b3e1dac8af603e9b48d254100fb6 (diff) | |
| download | openembedded-core-contrib-6fecb1a3e02a91b4945f1d3e5faf72e9c129e833.tar.gz | |
bitbake: cooker/utils: Drop custom 'interactive' variables list and store environment in BB_ORIGENV instead
Maintining hardcoded lists of user environmental variables is hacky,
replace these with the savedenv datastore. Allow access to that
through the BB_ORIGENV variable.
(Bitbake rev: 0a99563a4ea270594fd9a61da46f9387fb79dc66)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 1 | ||||
| -rw-r--r-- | bitbake/lib/bb/utils.py | 27 |
2 files changed, 2 insertions, 26 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 34fbfb0701..f70a04f460 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -185,6 +185,7 @@ class BBCooker: filtered_keys = bb.utils.approved_variables() bb.data.inheritFromOS(self.configuration.data, self.savedenv, filtered_keys) + self.configuration.data.setVar("BB_ORIGENV", self.savedenv) def enableDataTracking(self): self.configuration.data.enableTracking() diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 83159a6465..484fb2dc76 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -458,27 +458,6 @@ def preserved_envvars_exported(): 'USER', ] -def preserved_envvars_exported_interactive(): - """Variables which are taken from the environment and placed in and exported - from the metadata, for interactive tasks""" - return [ - 'COLORTERM', - 'DBUS_SESSION_BUS_ADDRESS', - 'DESKTOP_SESSION', - 'DESKTOP_STARTUP_ID', - 'DISPLAY', - 'GNOME_KEYRING_PID', - 'GNOME_KEYRING_SOCKET', - 'GPG_AGENT_INFO', - 'GTK_RC_FILES', - 'SESSION_MANAGER', - 'KRB5CCNAME', - 'SSH_AUTH_SOCK', - 'XAUTHORITY', - 'XDG_DATA_DIRS', - 'XDG_SESSION_COOKIE', - ] - def preserved_envvars(): """Variables which are taken from the environment and placed in the metadata""" v = [ @@ -487,7 +466,7 @@ def preserved_envvars(): 'BB_ENV_WHITELIST', 'BB_ENV_EXTRAWHITE', ] - return v + preserved_envvars_exported() + preserved_envvars_exported_interactive() + return v + preserved_envvars_exported() def filter_environment(good_vars): """ @@ -509,10 +488,6 @@ def filter_environment(good_vars): return removed_vars -def create_interactive_env(d): - for k in preserved_envvars_exported_interactive(): - os.setenv(k, d.getVar(k, True)) - def approved_variables(): """ Determine and return the list of whitelisted variables which are approved |