aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-18 15:40:37 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-18 15:49:56 +1300
commitd34af1901e034160aa61c4cf74dbce4cefdd1013 (patch)
tree5bec20b86e866afd74d31aea9d67688a0234bdb3
parent327e4bf5a84d5b49ccc65927df622c9ef6302d55 (diff)
downloadopenembedded-core-contrib-paule/esdk-runqemu-path.tar.gz
openembedded-core-contrib-paule/esdk-runqemu-path.tar.bz2
openembedded-core-contrib-paule/esdk-runqemu-path.zip
devtool: runqemu: work around runqemu script path assumptionpaule/esdk-runqemu-path
The new runqemu script assumes that if OECORE_NATIVE_SYSROOT is set then it shouldn't try to run bitbake to find out the values of various variables such as DEPLOY_DIR_IMAGE; this assumption is incorrect for the extensible SDK. To work around this, clear OECORE_NATIVE_SYSROOT in the environment when running runqemu. Fixes [YOCTO #10447]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--scripts/lib/devtool/runqemu.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/lib/devtool/runqemu.py b/scripts/lib/devtool/runqemu.py
index 303abcae4f..ae25cee08c 100644
--- a/scripts/lib/devtool/runqemu.py
+++ b/scripts/lib/devtool/runqemu.py
@@ -48,7 +48,12 @@ def runqemu(args, config, basepath, workspace):
raise DevtoolError('Unable to determine image name to run, please specify one')
try:
- exec_build_env_command(config.init_path, basepath, 'runqemu %s %s %s' % (machine, imagename, " ".join(args.args)), watch=True)
+ # FIXME runqemu assumes that if OECORE_NATIVE_SYSROOT is set then it shouldn't
+ # run bitbake to find out the values of various environment variables, which
+ # isn't the case for the extensible SDK. Work around it for now.
+ newenv = dict(os.environ)
+ newenv.pop('OECORE_NATIVE_SYSROOT', '')
+ exec_build_env_command(config.init_path, basepath, 'runqemu %s %s %s' % (machine, imagename, " ".join(args.args)), watch=True, env=newenv)
except bb.process.ExecutionError as e:
# We've already seen the output since watch=True, so just ensure we return something to the user
return e.exitcode