[oe-commits] [openembedded-core] 03/05: runqemu: don't try and invoke bitbake when running in a toolchain env

[git at git.openembedded.org]

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

commit 2c569678566c49b3ea237ef2de0fbae782263449
Author: Joshua Lock <joshua.g.lock at intel.com>
AuthorDate: Wed Sep 21 20:35:38 2016 +0100

    runqemu: don't try and invoke bitbake when running in a toolchain env
    
    If a MACHINE value is passed we can't validate it by running bitbake
    as the toolchain environment doesn't include the build system, we
    must assume that the passed value for MACHINE is correct.
    
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 scripts/runqemu | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu b/scripts/runqemu
index 591746f..e8360c2 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -306,11 +306,16 @@ class BaseConfig(object):
         # FIXME: testimage.bbclass exports these two variables into env,
         # are there other scenarios in which we need to support being
         # invoked by bitbake?
-        deploy = os.environ.get('DEPLOY_DIR_IMAGE', None)
-        bbchild = deploy and os.environ.get('OE_TMPDIR', None)
+        deploy = os.environ.get('DEPLOY_DIR_IMAGE')
+        bbchild = deploy and os.environ.get('OE_TMPDIR')
         if bbchild:
             self.set_machine_deploy_dir(arg, deploy)
             return
+        # also check whether we're running under a sourced toolchain
+        # environment file
+        if os.environ.get('OECORE_NATIVE_SYSROOT'):
+            self.set("MACHINE", arg)
+            return
 
         cmd = 'MACHINE=%s bitbake -e' % arg
         logger.info('Running %s...' % cmd)

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