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>
This commit is contained in:
parent
3300065035
commit
50016106ad
|
@ -135,7 +135,7 @@ class BBCooker:
|
||||||
if not self.server_registration_cb:
|
if not self.server_registration_cb:
|
||||||
bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data)
|
bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data)
|
||||||
|
|
||||||
bb.data.inheritFromOS(self.configuration.data)
|
bb.data.inheritFromOS(self.configuration.data, self.savedenv)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
self.parseConfigurationFiles(self.configuration.prefile,
|
self.parseConfigurationFiles(self.configuration.prefile,
|
||||||
|
|
|
@ -159,12 +159,12 @@ def expandKeys(alterdata, readdata = None):
|
||||||
ekey = todolist[key]
|
ekey = todolist[key]
|
||||||
renameVar(key, ekey, alterdata)
|
renameVar(key, ekey, alterdata)
|
||||||
|
|
||||||
def inheritFromOS(d):
|
def inheritFromOS(d, savedenv):
|
||||||
"""Inherit variables from the environment."""
|
"""Inherit variables from the initial environment."""
|
||||||
exportlist = bb.utils.preserved_envvars_exported()
|
exportlist = bb.utils.preserved_envvars_exported()
|
||||||
for s in os.environ.keys():
|
for s in savedenv.keys():
|
||||||
try:
|
try:
|
||||||
setVar(s, os.environ[s], d)
|
setVar(s, getVar(s, savedenv, True), d)
|
||||||
if s in exportlist:
|
if s in exportlist:
|
||||||
setVarFlag(s, "export", True, d)
|
setVarFlag(s, "export", True, d)
|
||||||
except TypeError:
|
except TypeError:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#@TYPE: Machine
|
#@TYPE: Machine
|
||||||
#@DESCRIPTION: Machine configuration for running
|
#@DESCRIPTION: Machine configuration for running
|
||||||
|
|
||||||
TARGET_FPU = "hard"
|
TARGET_FPU = ""
|
||||||
|
|
||||||
require conf/machine/include/tune-ppc603e.inc
|
require conf/machine/include/tune-ppc603e.inc
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue