summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-07-13 00:31:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-27 22:36:52 +0100
commit0420171c087f9ed9cb9ead802573998ae936cd03 (patch)
tree9c74bcf23f359dc9a9d8f883379aac8ba9f1d606 /scripts
parentb9568cdd464c0417389a0c53f6bb9daa237dfebc (diff)
downloadpoky-0420171c087f9ed9cb9ead802573998ae936cd03.tar.gz
runqemu: check tar.bz2 and .tar.gz
Handle them as nfs, so that cmd like the following can be boot: $ runqemu tmp/deploy/images/qemux86/core-image-minimal-qemux86.tar.bz2 [YOCTO #11286] (From OE-Core rev: 552093d1f60ca335d95bcfc9d6070ec551ebe6c0) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 781814ae65..bdb559f82f 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -218,7 +218,8 @@ class BaseConfig(object):
218 self.lock_descriptor = '' 218 self.lock_descriptor = ''
219 self.bitbake_e = '' 219 self.bitbake_e = ''
220 self.snapshot = False 220 self.snapshot = False
221 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 'cpio.gz', 'cpio', 'ramfs') 221 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
222 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz')
222 self.vmtypes = ('hddimg', 'hdddirect', 'wic', 'vmdk', 'qcow2', 'vdi', 'iso') 223 self.vmtypes = ('hddimg', 'hdddirect', 'wic', 'vmdk', 'qcow2', 'vdi', 'iso')
223 self.network_device = "-device e1000,netdev=net0,mac=@MAC@" 224 self.network_device = "-device e1000,netdev=net0,mac=@MAC@"
224 # Use different mac section for tap and slirp to avoid 225 # Use different mac section for tap and slirp to avoid
@@ -277,6 +278,8 @@ class BaseConfig(object):
277 if not self.fstype or self.fstype == fst: 278 if not self.fstype or self.fstype == fst:
278 if fst == 'ramfs': 279 if fst == 'ramfs':
279 fst = 'cpio.gz' 280 fst = 'cpio.gz'
281 if fst in ('tar.bz2', 'tar.gz'):
282 fst = 'nfs'
280 self.fstype = fst 283 self.fstype = fst
281 else: 284 else:
282 raise RunQemuError("Conflicting: FSTYPE %s and %s" % (self.fstype, fst)) 285 raise RunQemuError("Conflicting: FSTYPE %s and %s" % (self.fstype, fst))