summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 11:01:47 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-11 11:05:05 +0100
commit19c3c6dff3aecbc649608c7cc9ba195f1fa6ed4c (patch)
treeda58333b36df3dca798d48a86cccda8bc09aae27
parent3e7d6697bacc527560450cee98cc8f83e346dea4 (diff)
downloadpoky-19c3c6dff3aecbc649608c7cc9ba195f1fa6ed4c.tar.gz
bitbake: utils: Fix BB_PRESERVE_ENV
BB_PRESERVE_ENV wasn't working since data.inheritFromOS wasn't getting a correct list of keys to import into the data store. This fixes things so it does add all environment variables into the data store when BB_PRESERVE_ENV is used. (Bitbake rev: 843e9339c5ee3c99657a40a0e2c7dbd777b6ef06) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 7686602432..ae3ef1054b 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -532,6 +532,8 @@ def approved_variables():
532 Determine and return the list of whitelisted variables which are approved 532 Determine and return the list of whitelisted variables which are approved
533 to remain in the envrionment. 533 to remain in the envrionment.
534 """ 534 """
535 if 'BB_PRESERVE_ENV' in os.environ:
536 return os.environ.keys()
535 approved = [] 537 approved = []
536 if 'BB_ENV_WHITELIST' in os.environ: 538 if 'BB_ENV_WHITELIST' in os.environ:
537 approved = os.environ['BB_ENV_WHITELIST'].split() 539 approved = os.environ['BB_ENV_WHITELIST'].split()