summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSinan Kaya <okaya@kernel.org>2021-01-17 15:25:17 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-20 00:45:05 +0000
commit24cd0907415c70c7df31105bd9b479767f32c2b8 (patch)
treea31077c571aadb7f07cfd5f6255aab588216773c
parent59b07a71f32c84e592d66595a2a7e1ae9c7ebef8 (diff)
downloadpoky-24cd0907415c70c7df31105bd9b479767f32c2b8.tar.gz
runqemu: Add support for VHD/VHDX rootfs
(From OE-Core rev: fafa2fe6d4d40ab6ba7d39b397d2bde9eb0d6b72) Signed-off-by: Sinan Kaya <okaya@kernel.org> Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/runqemu8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index e5e66f3453..dd92a64553 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -94,11 +94,13 @@ Examples:
94 runqemu qemux86-64 core-image-sato ext4 94 runqemu qemux86-64 core-image-sato ext4
95 runqemu qemux86-64 wic-image-minimal wic 95 runqemu qemux86-64 wic-image-minimal wic
96 runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial 96 runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial
97 runqemu qemux86 iso/hddimg/wic.vmdk/wic.qcow2/wic.vdi/ramfs/cpio.gz... 97 runqemu qemux86 iso/hddimg/wic.vmdk/wic.vhd/wic.vhdx/wic.qcow2/wic.vdi/ramfs/cpio.gz...
98 runqemu qemux86 qemuparams="-m 256" 98 runqemu qemux86 qemuparams="-m 256"
99 runqemu qemux86 bootparams="psplash=false" 99 runqemu qemux86 bootparams="psplash=false"
100 runqemu path/to/<image>-<machine>.wic 100 runqemu path/to/<image>-<machine>.wic
101 runqemu path/to/<image>-<machine>.wic.vmdk 101 runqemu path/to/<image>-<machine>.wic.vmdk
102 runqemu path/to/<image>-<machine>.wic.vhdx
103 runqemu path/to/<image>-<machine>.wic.vhd
102""") 104""")
103 105
104def check_tun(): 106def check_tun():
@@ -179,7 +181,7 @@ class BaseConfig(object):
179 self.portlocks = {} 181 self.portlocks = {}
180 self.bitbake_e = '' 182 self.bitbake_e = ''
181 self.snapshot = False 183 self.snapshot = False
182 self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi') 184 self.wictypes = ('wic', 'wic.vmdk', 'wic.qcow2', 'wic.vdi', "wic.vhd", "wic.vhdx")
183 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 185 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
184 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') 186 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz')
185 self.vmtypes = ('hddimg', 'iso') 187 self.vmtypes = ('hddimg', 'iso')
@@ -1203,7 +1205,7 @@ class BaseConfig(object):
1203 return 1205 return
1204 if 'wic.' in self.fstype: 1206 if 'wic.' in self.fstype:
1205 self.fstype = self.fstype[4:] 1207 self.fstype = self.fstype[4:]
1206 rootfs_format = self.fstype if self.fstype in ('vmdk', 'qcow2', 'vdi') else 'raw' 1208 rootfs_format = self.fstype if self.fstype in ('vmdk', 'vhd', 'vhdx', 'qcow2', 'vdi') else 'raw'
1207 1209
1208 qb_rootfs_opt = self.get('QB_ROOTFS_OPT') 1210 qb_rootfs_opt = self.get('QB_ROOTFS_OPT')
1209 if qb_rootfs_opt: 1211 if qb_rootfs_opt: