diff options
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/runqueue.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/utils.py | 20 |
3 files changed, 14 insertions, 12 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 7cf17b0057..97da43fff4 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -34,6 +34,8 @@ __whitespace_split__ = re.compile(r'(\s)') | |||
34 | __override_regexp__ = re.compile(r'[a-z0-9]+') | 34 | __override_regexp__ = re.compile(r'[a-z0-9]+') |
35 | 35 | ||
36 | bitbake_renamed_vars = { | 36 | bitbake_renamed_vars = { |
37 | "BB_ENV_WHITELIST": "BB_ENV_PASSTHROUGH", | ||
38 | "BB_ENV_EXTRAWHITE": "BB_ENV_PASSTHROUGH_ADDITIONS", | ||
37 | "BB_HASHBASE_WHITELIST": "BB_BASEHASH_IGNORE_VARS", | 39 | "BB_HASHBASE_WHITELIST": "BB_BASEHASH_IGNORE_VARS", |
38 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", | 40 | "BB_HASHTASK_WHITELIST": "BB_TASKHASH_IGNORE_TASKS", |
39 | } | 41 | } |
diff --git a/bitbake/lib/bb/tests/runqueue.py b/bitbake/lib/bb/tests/runqueue.py index 35d5a843ff..79b79b5a7c 100644 --- a/bitbake/lib/bb/tests/runqueue.py +++ b/bitbake/lib/bb/tests/runqueue.py | |||
@@ -29,14 +29,14 @@ class RunQueueTests(unittest.TestCase): | |||
29 | def run_bitbakecmd(self, cmd, builddir, sstatevalid="", slowtasks="", extraenv=None, cleanup=False): | 29 | def run_bitbakecmd(self, cmd, builddir, sstatevalid="", slowtasks="", extraenv=None, cleanup=False): |
30 | env = os.environ.copy() | 30 | env = os.environ.copy() |
31 | env["BBPATH"] = os.path.realpath(os.path.join(os.path.dirname(__file__), "runqueue-tests")) | 31 | env["BBPATH"] = os.path.realpath(os.path.join(os.path.dirname(__file__), "runqueue-tests")) |
32 | env["BB_ENV_EXTRAWHITE"] = "SSTATEVALID SLOWTASKS TOPDIR" | 32 | env["BB_ENV_PASSTHROUGH_ADDITIONS"] = "SSTATEVALID SLOWTASKS TOPDIR" |
33 | env["SSTATEVALID"] = sstatevalid | 33 | env["SSTATEVALID"] = sstatevalid |
34 | env["SLOWTASKS"] = slowtasks | 34 | env["SLOWTASKS"] = slowtasks |
35 | env["TOPDIR"] = builddir | 35 | env["TOPDIR"] = builddir |
36 | if extraenv: | 36 | if extraenv: |
37 | for k in extraenv: | 37 | for k in extraenv: |
38 | env[k] = extraenv[k] | 38 | env[k] = extraenv[k] |
39 | env["BB_ENV_EXTRAWHITE"] = env["BB_ENV_EXTRAWHITE"] + " " + k | 39 | env["BB_ENV_PASSTHROUGH_ADDITIONS"] = env["BB_ENV_PASSTHROUGH_ADDITIONS"] + " " + k |
40 | try: | 40 | try: |
41 | output = subprocess.check_output(cmd, env=env, stderr=subprocess.STDOUT,universal_newlines=True, cwd=builddir) | 41 | output = subprocess.check_output(cmd, env=env, stderr=subprocess.STDOUT,universal_newlines=True, cwd=builddir) |
42 | print(output) | 42 | print(output) |
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index c07d19cfae..2e8256101a 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -589,8 +589,8 @@ def preserved_envvars(): | |||
589 | v = [ | 589 | v = [ |
590 | 'BBPATH', | 590 | 'BBPATH', |
591 | 'BB_PRESERVE_ENV', | 591 | 'BB_PRESERVE_ENV', |
592 | 'BB_ENV_WHITELIST', | 592 | 'BB_ENV_PASSTHROUGH', |
593 | 'BB_ENV_EXTRAWHITE', | 593 | 'BB_ENV_PASSTHROUGH_ADDITIONS', |
594 | ] | 594 | ] |
595 | return v + preserved_envvars_exported() | 595 | return v + preserved_envvars_exported() |
596 | 596 | ||
@@ -621,21 +621,21 @@ def filter_environment(good_vars): | |||
621 | 621 | ||
622 | def approved_variables(): | 622 | def approved_variables(): |
623 | """ | 623 | """ |
624 | Determine and return the list of whitelisted variables which are approved | 624 | Determine and return the list of variables which are approved |
625 | to remain in the environment. | 625 | to remain in the environment. |
626 | """ | 626 | """ |
627 | if 'BB_PRESERVE_ENV' in os.environ: | 627 | if 'BB_PRESERVE_ENV' in os.environ: |
628 | return os.environ.keys() | 628 | return os.environ.keys() |
629 | approved = [] | 629 | approved = [] |
630 | if 'BB_ENV_WHITELIST' in os.environ: | 630 | if 'BB_ENV_PASSTHROUGH' in os.environ: |
631 | approved = os.environ['BB_ENV_WHITELIST'].split() | 631 | approved = os.environ['BB_ENV_PASSTHROUGH'].split() |
632 | approved.extend(['BB_ENV_WHITELIST']) | 632 | approved.extend(['BB_ENV_PASSTHROUGH']) |
633 | else: | 633 | else: |
634 | approved = preserved_envvars() | 634 | approved = preserved_envvars() |
635 | if 'BB_ENV_EXTRAWHITE' in os.environ: | 635 | if 'BB_ENV_PASSTHROUGH_ADDITIONS' in os.environ: |
636 | approved.extend(os.environ['BB_ENV_EXTRAWHITE'].split()) | 636 | approved.extend(os.environ['BB_ENV_PASSTHROUGH_ADDITIONS'].split()) |
637 | if 'BB_ENV_EXTRAWHITE' not in approved: | 637 | if 'BB_ENV_PASSTHROUGH_ADDITIONS' not in approved: |
638 | approved.extend(['BB_ENV_EXTRAWHITE']) | 638 | approved.extend(['BB_ENV_PASSTHROUGH_ADDITIONS']) |
639 | return approved | 639 | return approved |
640 | 640 | ||
641 | def clean_environment(): | 641 | def clean_environment(): |