diff options
Diffstat (limited to 'bitbake/lib/bb/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 27 |
1 files changed, 1 insertions, 26 deletions
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(): | |||
458 | 'USER', | 458 | 'USER', |
459 | ] | 459 | ] |
460 | 460 | ||
461 | def preserved_envvars_exported_interactive(): | ||
462 | """Variables which are taken from the environment and placed in and exported | ||
463 | from the metadata, for interactive tasks""" | ||
464 | return [ | ||
465 | 'COLORTERM', | ||
466 | 'DBUS_SESSION_BUS_ADDRESS', | ||
467 | 'DESKTOP_SESSION', | ||
468 | 'DESKTOP_STARTUP_ID', | ||
469 | 'DISPLAY', | ||
470 | 'GNOME_KEYRING_PID', | ||
471 | 'GNOME_KEYRING_SOCKET', | ||
472 | 'GPG_AGENT_INFO', | ||
473 | 'GTK_RC_FILES', | ||
474 | 'SESSION_MANAGER', | ||
475 | 'KRB5CCNAME', | ||
476 | 'SSH_AUTH_SOCK', | ||
477 | 'XAUTHORITY', | ||
478 | 'XDG_DATA_DIRS', | ||
479 | 'XDG_SESSION_COOKIE', | ||
480 | ] | ||
481 | |||
482 | def preserved_envvars(): | 461 | def preserved_envvars(): |
483 | """Variables which are taken from the environment and placed in the metadata""" | 462 | """Variables which are taken from the environment and placed in the metadata""" |
484 | v = [ | 463 | v = [ |
@@ -487,7 +466,7 @@ def preserved_envvars(): | |||
487 | 'BB_ENV_WHITELIST', | 466 | 'BB_ENV_WHITELIST', |
488 | 'BB_ENV_EXTRAWHITE', | 467 | 'BB_ENV_EXTRAWHITE', |
489 | ] | 468 | ] |
490 | return v + preserved_envvars_exported() + preserved_envvars_exported_interactive() | 469 | return v + preserved_envvars_exported() |
491 | 470 | ||
492 | def filter_environment(good_vars): | 471 | def filter_environment(good_vars): |
493 | """ | 472 | """ |
@@ -509,10 +488,6 @@ def filter_environment(good_vars): | |||
509 | 488 | ||
510 | return removed_vars | 489 | return removed_vars |
511 | 490 | ||
512 | def create_interactive_env(d): | ||
513 | for k in preserved_envvars_exported_interactive(): | ||
514 | os.setenv(k, d.getVar(k, True)) | ||
515 | |||
516 | def approved_variables(): | 491 | def approved_variables(): |
517 | """ | 492 | """ |
518 | Determine and return the list of whitelisted variables which are approved | 493 | Determine and return the list of whitelisted variables which are approved |