diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-10-18 15:51:16 +1300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-10-25 22:39:57 +0100 |
commit | abff69a48bf3076ce8e21356accdc8d85d2c8dbf (patch) | |
tree | ba0b97844235fe7fcd314b657b138165d46fe5b1 | |
parent | 1886ab2f1dc1e3b5758a85604998e8deb9198f5e (diff) | |
download | openembedded-core-abff69a48bf3076ce8e21356accdc8d85d2c8dbf.tar.gz openembedded-core-abff69a48bf3076ce8e21356accdc8d85d2c8dbf.tar.bz2 openembedded-core-abff69a48bf3076ce8e21356accdc8d85d2c8dbf.zip |
devtool: runqemu: work around runqemu script path assumption
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>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/devtool/runqemu.py | 7 |
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 |