summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-09-21 20:35:38 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 21:59:14 +0100
commit2c569678566c49b3ea237ef2de0fbae782263449 (patch)
tree65f4f9d7f2ca03a346b9d3bedb268539de4232af
parenta5adabe1414061d6864c5913dd5e66a4527838f1 (diff)
downloadopenembedded-core-2c569678566c49b3ea237ef2de0fbae782263449.tar.gz
openembedded-core-2c569678566c49b3ea237ef2de0fbae782263449.tar.bz2
openembedded-core-2c569678566c49b3ea237ef2de0fbae782263449.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu9
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 591746f657..e8360c2af1 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)