[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5138/8267] runqemu: improve when no machine specified

[Emmanuele Bassi <ebassi src gnome org>]

commit ac451ea84cbb111917331c1126ab591d313e9ead
Author: Robert Yang <liezhi yang windriver com>
Date:   Thu Mar 16 03:13:24 2017 -0700

    runqemu: improve when no machine specified
    
    Fixed:
    $ runqemu core-image-minimal
    [snip]
    Exception: FSTYPE is NULL!
    [snip]
    
    Get DEPLOY_DIR_IMAGE from "bitbake -e" to make it work.
    
    [YOCTO #10471]
    
    (From OE-Core rev: ca551b72a020782f164703765b97156000b908d2)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/runqemu |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/scripts/runqemu b/scripts/runqemu
index 3e21724..cfdb0c5 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -443,6 +443,12 @@ class BaseConfig(object):
                         self.set("DEPLOY_DIR_IMAGE", p)
             self.check_arg_machine(unknown_arg)
 
+        if not (self.get('MACHINE') or self.get('DEPLOY_DIR_IMAGE')):
+            self.load_bitbake_env()
+            s = re.search('^DEPLOY_DIR_IMAGE="(.*)"', self.bitbake_e, re.M)
+            if s:
+                self.set("DEPLOY_DIR_IMAGE", s.group(1))
+
     def check_kvm(self):
         """Check kvm and kvm-host"""
         if not (self.kvm_enabled or self.vhost_enabled):