From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 13 Jul 2017 07:28:46 +0000 (-0700)
Subject: runqemu: check qbconfload before running bitbake
X-Git-Tag: uninative-1.7~29
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=89e97033a8a27a695567c321ed0ebf17f23f8d9b;p=openembedded-core.git

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>
---

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: