[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6964/8267] runqemu: check qbconfload before running bitbake

[Emmanuele Bassi <ebassi src gnome org>]

commit b9568cdd464c0417389a0c53f6bb9daa237dfebc
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Jul 13 00:28:46 2017 -0700

    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".
    
    (From OE-Core rev: 89e97033a8a27a695567c321ed0ebf17f23f8d9b)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 7188bd7..781814a 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: