diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-07-25 11:27:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-26 13:46:27 +0100 |
commit | 50016106ad1e165a60639bfbc7b31e9c66ae5474 (patch) | |
tree | 1b54f7ad4bf216f61d59969b5b1c8b6b732065e7 /bitbake/lib/bb/cooker.py | |
parent | 3300065035cc9900340e15796fa0b33391c055c3 (diff) | |
download | poky-50016106ad1e165a60639bfbc7b31e9c66ae5474.tar.gz |
data|cooker: use saved environment variables when calling inheritFromOS
Now that we have a pristine copy of the variables available at launch time
we can use them when looking to inherit the OS's environment.
(Bitbake rev: 21c21fcc5871e81d8d497b6baed605cdd74c4571)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 044ceb179e..f99d78634f 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -135,7 +135,7 @@ class BBCooker: | |||
135 | if not self.server_registration_cb: | 135 | if not self.server_registration_cb: |
136 | bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) | 136 | bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) |
137 | 137 | ||
138 | bb.data.inheritFromOS(self.configuration.data) | 138 | bb.data.inheritFromOS(self.configuration.data, self.savedenv) |
139 | 139 | ||
140 | try: | 140 | try: |
141 | self.parseConfigurationFiles(self.configuration.prefile, | 141 | self.parseConfigurationFiles(self.configuration.prefile, |