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>
This commit is contained in:
Richard Purdie 2013-09-11 11:01:47 +01:00
parent 3e7d6697ba
commit 19c3c6dff3
1 changed files with 2 additions and 0 deletions

View File

@ -532,6 +532,8 @@ def approved_variables():
Determine and return the list of whitelisted variables which are approved Determine and return the list of whitelisted variables which are approved
to remain in the envrionment. to remain in the envrionment.
""" """
if 'BB_PRESERVE_ENV' in os.environ:
return os.environ.keys()
approved = [] approved = []
if 'BB_ENV_WHITELIST' in os.environ: if 'BB_ENV_WHITELIST' in os.environ:
approved = os.environ['BB_ENV_WHITELIST'].split() approved = os.environ['BB_ENV_WHITELIST'].split()