diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 11:01:47 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 11:05:05 +0100 |
| commit | 19c3c6dff3aecbc649608c7cc9ba195f1fa6ed4c (patch) | |
| tree | da58333b36df3dca798d48a86cccda8bc09aae27 /bitbake/lib/bb/utils.py | |
| parent | 3e7d6697bacc527560450cee98cc8f83e346dea4 (diff) | |
| download | ast2050-yocto-poky-19c3c6dff3aecbc649608c7cc9ba195f1fa6ed4c.zip ast2050-yocto-poky-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>
Diffstat (limited to 'bitbake/lib/bb/utils.py')
| -rw-r--r-- | bitbake/lib/bb/utils.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 7686602..ae3ef10 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -532,6 +532,8 @@ def approved_variables(): Determine and return the list of whitelisted variables which are approved to remain in the envrionment. """ + if 'BB_PRESERVE_ENV' in os.environ: + return os.environ.keys() approved = [] if 'BB_ENV_WHITELIST' in os.environ: approved = os.environ['BB_ENV_WHITELIST'].split() |
