From 50016106ad1e165a60639bfbc7b31e9c66ae5474 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 25 Jul 2011 11:27:55 -0700 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/cooker.py | 2 +- bitbake/lib/bb/data.py | 8 ++++---- meta-yocto/conf/machine/mpc8315e-rdb.conf | 2 +- 3 files changed, 6 insertions(+), 6 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: if not self.server_registration_cb: bb.data.setVar("BB_WORKERCONTEXT", "1", self.configuration.data) - bb.data.inheritFromOS(self.configuration.data) + bb.data.inheritFromOS(self.configuration.data, self.savedenv) try: 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): ekey = todolist[key] renameVar(key, ekey, alterdata) -def inheritFromOS(d): - """Inherit variables from the environment.""" +def inheritFromOS(d, savedenv): + """Inherit variables from the initial environment.""" exportlist = bb.utils.preserved_envvars_exported() - for s in os.environ.keys(): + for s in savedenv.keys(): try: - setVar(s, os.environ[s], d) + setVar(s, getVar(s, savedenv, True), d) if s in exportlist: setVarFlag(s, "export", True, d) except TypeError: diff --git a/meta-yocto/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf index eb527cf9b2..172deec68e 100644 --- a/meta-yocto/conf/machine/mpc8315e-rdb.conf +++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf @@ -1,7 +1,7 @@ #@TYPE: Machine #@DESCRIPTION: Machine configuration for running -TARGET_FPU = "hard" +TARGET_FPU = "" require conf/machine/include/tune-ppc603e.inc -- cgit v1.2.3-54-g00ecf