aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-03-16 03:13:24 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-16 22:11:15 +0000
commitca551b72a020782f164703765b97156000b908d2 (patch)
tree2ff4020ad997aef551da52089f1a1a5c11d24abe
parent10dc69467677a4ce2a26aa670bbb9c1d7d783a0e (diff)
downloadopenembedded-core-contrib-ca551b72a020782f164703765b97156000b908d2.zip
openembedded-core-contrib-ca551b72a020782f164703765b97156000b908d2.tar.gz
openembedded-core-contrib-ca551b72a020782f164703765b97156000b908d2.tar.bz2
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>
-rwxr-xr-xscripts/runqemu6
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):