]> code.ossystems Code Review - openembedded-core.git/commitdiff
runqemu: check qbconfload before running bitbake
authorRobert Yang <liezhi.yang@windriver.com>
Thu, 13 Jul 2017 07:28:46 +0000 (00:28 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 27 Jul 2017 08:21:48 +0000 (09:21 +0100)
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>
scripts/runqemu

index 7188bd78830a89a176a52021c50435331a628b0a..781814ae65117ed3d9dd9c6717c874f3d8250ce3 100755 (executable)
@@ -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: