summaryrefslogtreecommitdiffstats
path: root/scripts/runqemu
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-13 00:28:46 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-27 09:21:48 +0100
commit89e97033a8a27a695567c321ed0ebf17f23f8d9b (patch)
treecc5571922f15a9fd4edbe264a0c72ccb34273058 /scripts/runqemu
parente696425e7627edada128b40304fddc84d8d56ba7 (diff)
downloadopenembedded-core-89e97033a8a27a695567c321ed0ebf17f23f8d9b.tar.gz
runqemu: check qbconfload before running bitbake
If qbconfload (.qemuboot.conf is found) is present, we can get DEPLOY_DIR_IMAGE from it rather than "bitbake -e". Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'scripts/runqemu')
-rwxr-xr-xscripts/runqemu2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 7188bd7883..781814ae65 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -466,7 +466,7 @@ class BaseConfig(object):
self.check_arg_machine(unknown_arg)
- if not self.get('DEPLOY_DIR_IMAGE'):
+ if not (self.get('DEPLOY_DIR_IMAGE') or self.qbconfload):
self.load_bitbake_env()
s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M)
if s: