diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-09-21 20:35:38 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-21 22:02:16 +0100 |
| commit | 5d3c56f2a5a5b72592cf5be1ecd6854b22b9c781 (patch) | |
| tree | cc6c7e21983f5f7c8c1f29ae7a4acef07642e59c /scripts | |
| parent | c97912a17ddc65f0a4045cbcf4daacc86d26bf09 (diff) | |
| download | openembedded-core-contrib-5d3c56f2a5a5b72592cf5be1ecd6854b22b9c781.tar.gz | |
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.
(From OE-Core rev: 2c569678566c49b3ea237ef2de0fbae782263449)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/runqemu | 9 |
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) |