From 19c3c6dff3aecbc649608c7cc9ba195f1fa6ed4c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 11 Sep 2013 11:01:47 +0100 Subject: [PATCH] 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 --- bitbake/lib/bb/utils.py | 2 ++ 1 file changed, 2 insertions(+) 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(): 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()