From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 16 Mar 2017 10:13:24 +0000 (-0700)
Subject: runqemu: improve when no machine specified
X-Git-Tag: uninative-1.6~167
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ca551b72a020782f164703765b97156000b908d2;p=openembedded-core.git

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]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/runqemu b/scripts/runqemu
index 3e2172434c..cfdb0c53fb 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):