diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/data.py | 8 |
2 files changed, 5 insertions, 5 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, |
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 2269f9dc74..65144bfe52 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -159,12 +159,12 @@ def expandKeys(alterdata, readdata = None): | |||
159 | ekey = todolist[key] | 159 | ekey = todolist[key] |
160 | renameVar(key, ekey, alterdata) | 160 | renameVar(key, ekey, alterdata) |
161 | 161 | ||
162 | def inheritFromOS(d): | 162 | def inheritFromOS(d, savedenv): |
163 | """Inherit variables from the environment.""" | 163 | """Inherit variables from the initial environment.""" |
164 | exportlist = bb.utils.preserved_envvars_exported() | 164 | exportlist = bb.utils.preserved_envvars_exported() |
165 | for s in os.environ.keys(): | 165 | for s in savedenv.keys(): |
166 | try: | 166 | try: |
167 | setVar(s, os.environ[s], d) | 167 | setVar(s, getVar(s, savedenv, True), d) |
168 | if s in exportlist: | 168 | if s in exportlist: |
169 | setVarFlag(s, "export", True, d) | 169 | setVarFlag(s, "export", True, d) |
170 | except TypeError: | 170 | except TypeError: |