[oe-commits] [openembedded-core] 01/02: devtool: runqemu: work around runqemu script path assumption

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit abff69a48bf3076ce8e21356accdc8d85d2c8dbf
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
AuthorDate: Tue Oct 18 15:51:16 2016 +1300

    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 at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/lib/devtool/runqemu.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/scripts/lib/devtool/runqemu.py b/scripts/lib/devtool/runqemu.py
index 303abca..ae25cee 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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.