From 766dccf9754437440ab5d6eb993248035ff1339b Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 16 Mar 2017 03:13:26 -0700 Subject: runqemu: only boot ramfs when specified This can fix a problem: IMAGE_FSTYPES += "iso" $ bitbake core-image-minimal $ runqemu qemux86 It may boot core-image-minimal-initramfs rather than core-image-minimal, this is not what we want usually. This patch makes it avoid booting ramfs when there are other choices, or when it is specified, for example, "runqemu qemux86 ramfs" (From OE-Core rev: 614bde6774f4dfd414066bbaf75ed422943e37ab) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- scripts/runqemu | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'scripts/runqemu') diff --git a/scripts/runqemu b/scripts/runqemu index 17219563a8..4fa2867e73 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -660,7 +660,15 @@ class BaseConfig(object): logger.info('Running %s...' % cmd) qbs = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).stdout.read().decode('utf-8') if qbs: - self.qemuboot = qbs.split()[0] + for qb in qbs.split(): + # Don't use initramfs when other choices unless fstype is ramfs + if '-initramfs-' in os.path.basename(qb) and self.fstype != 'cpio.gz': + continue + self.qemuboot = qb + break + if not self.qemuboot: + # Use the first one when no choice + self.qemuboot = qbs.split()[0] self.qbconfload = True if not self.qemuboot: -- cgit v1.2.3-54-g00ecf