diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | bin/bitbake | 11 | ||||
| -rw-r--r-- | lib/bb/data.py | 21 | ||||
| -rw-r--r-- | lib/bb/data_smart.py | 3 | ||||
| -rw-r--r-- | lib/bb/utils.py | 54 |
5 files changed, 76 insertions, 18 deletions
@@ -149,6 +149,11 @@ Changes in Bitbake 1.9.x: - Fix PACKAGES_DYNAMIC handling of packages with '++' in the name - Rename __depends to __base_depends after configuration parsing so we don't recheck the validity of the config files time after time + - Add better environmental variable handling. By default it will now only pass certain + whitelisted variables into the data store. If BB_PRESERVE_ENV is set bitbake will use + all variable from the environment. If BB_ENV_WHITELIST is set, that whitelist will be + used instead of the internal bitbake one. Alternatively, BB_ENV_EXTRAWHITE can be used + to extend the internal whitelist. Changes in Bitbake 1.8.0: - Release 1.7.x as a stable series diff --git a/bin/bitbake b/bin/bitbake index 6f0c9ed61..ef453a58a 100755 --- a/bin/bitbake +++ b/bin/bitbake @@ -140,6 +140,17 @@ Default BBFILES are the .bb files in the current directory.""" ) cooker = bb.cooker.BBCooker(configuration) + + # Optionally clean up the environment + if 'BB_PRESERVE_ENV' not in os.environ: + if 'BB_ENV_WHITELIST' in os.environ: + good_vars = os.environ['BB_ENV_WHITELIST'].split() + else: + good_vars = bb.utils.preserved_envvars_list() + if 'BB_ENV_EXTRAWHITE' in os.environ: + good_vars.extend(os.environ['BB_ENV_EXTRAWHITE'].split()) + bb.utils.filter_environment(good_vars) + cooker.parseConfiguration() host = cooker.server.host port = cooker.server.port diff --git a/lib/bb/data.py b/lib/bb/data.py index 54b2615af..82eef4498 100644 --- a/lib/bb/data.py +++ b/lib/bb/data.py @@ -324,21 +324,15 @@ def expandData(alterdata, readdata = None): if val != expanded: setVar(key, expanded, alterdata) -import os - def inheritFromOS(d): """Inherit variables from the environment.""" -# fakeroot needs to be able to set these - non_inherit_vars = [ "LD_LIBRARY_PATH", "LD_PRELOAD" ] for s in os.environ.keys(): - if not s in non_inherit_vars: - try: - setVar(s, os.environ[s], d) - setVarFlag(s, 'matchesenv', '1', d) - except TypeError: - pass - -import sys + try: + setVar(s, os.environ[s], d) + except TypeError: + pass + os.unsetenv(s) + del os.environ[s] def emit_var(var, o=sys.__stdout__, d = init(), all=False): """Emit a variable to be sourced by a shell.""" @@ -379,9 +373,6 @@ def emit_var(var, o=sys.__stdout__, d = init(), all=False): o.write('unset %s\n' % varExpanded) return 1 - if getVarFlag(var, 'matchesenv', d): - return 0 - val.rstrip() if not val: return 0 diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index b3a51b0ed..0d39d20a4 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -149,9 +149,6 @@ class DataSmart: if not var in self.dict: self._makeShadowCopy(var) - if self.getVarFlag(var, 'matchesenv'): - self.delVarFlag(var, 'matchesenv') - self.setVarFlag(var, 'export', 1) # more cookies for the cookie monster if '_' in var: diff --git a/lib/bb/utils.py b/lib/bb/utils.py index 0a0c9ada3..9c9eb5d32 100644 --- a/lib/bb/utils.py +++ b/lib/bb/utils.py @@ -296,6 +296,60 @@ def sha256_file(filename): s.update(line) return s.hexdigest() +def preserved_envvars_list(): + return [ + 'BBPATH', + 'BB_PRESERVE_ENV', + 'BB_ENV_WHITELIST', + 'BB_ENV_EXTRAWHITE', + 'COLORTERM', + 'DBUS_SESSION_BUS_ADDRESS', + 'DESKTOP_SESSION', + 'DESKTOP_STARTUP_ID', + 'DISPLAY', + 'GNOME_KEYRING_PID', + 'GNOME_KEYRING_SOCKET', + 'GPG_AGENT_INFO', + 'GTK_RC_FILES', + 'HOME', + 'LANG', + 'LOGNAME', + 'PATH', + 'PWD', + 'SESSION_MANAGER', + 'SHELL', + 'SSH_AUTH_SOCK', + 'TERM', + 'USER', + 'USERNAME', + '_', + 'XAUTHORITY', + 'XDG_DATA_DIRS', + 'XDG_SESSION_COOKIE', + ] + +def filter_environment(good_vars): + """ + Create a pristine environment for bitbake. This will remove variables that + are not known and may influence the build in a negative way. + """ + + import bb + + removed_vars = [] + for key in os.environ.keys(): + if key in good_vars: + continue + + removed_vars.append(key) + os.unsetenv(key) + del os.environ[key] + + if len(removed_vars): + bb.debug(1, "Removed the following variables from the environment:", ",".join(removed_vars)) + + return removed_vars + def prunedir(topdir): # Delete everything reachable from the directory named in 'topdir'. # CAUTION: This is dangerous! |