summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-10-18 15:51:16 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-25 22:40:09 +0100
commita8169807e85457d90016522a6eb7113c9159ec18 (patch)
treef64f8810bd294617c19c31746380dee71f9fd045 /scripts/lib/devtool
parent30d1af89ce2a2fb30f32a898ec12c9a51db57013 (diff)
downloadpoky-a8169807e85457d90016522a6eb7113c9159ec18.tar.gz
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]. (From OE-Core rev: abff69a48bf3076ce8e21356accdc8d85d2c8dbf) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool')
-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):
48 raise DevtoolError('Unable to determine image name to run, please specify one') 48 raise DevtoolError('Unable to determine image name to run, please specify one')
49 49
50 try: 50 try:
51 exec_build_env_command(config.init_path, basepath, 'runqemu %s %s %s' % (machine, imagename, " ".join(args.args)), watch=True) 51 # FIXME runqemu assumes that if OECORE_NATIVE_SYSROOT is set then it shouldn't
52 # run bitbake to find out the values of various environment variables, which
53 # isn't the case for the extensible SDK. Work around it for now.
54 newenv = dict(os.environ)
55 newenv.pop('OECORE_NATIVE_SYSROOT', '')
56 exec_build_env_command(config.init_path, basepath, 'runqemu %s %s %s' % (machine, imagename, " ".join(args.args)), watch=True, env=newenv)
52 except bb.process.ExecutionError as e: 57 except bb.process.ExecutionError as e:
53 # We've already seen the output since watch=True, so just ensure we return something to the user 58 # We've already seen the output since watch=True, so just ensure we return something to the user
54 return e.exitcode 59 return e.exitcode