summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-07-28 20:14:32 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-30 08:46:20 +0100
commit9d07c736e39a9aa922630b4241eda185a19a11ea (patch)
treeed423305c18dc7bac77ca01e8621ffd40f976b79 /scripts
parentd2ebee7c3a0c8ab9a09ebad12a2fda51f8d10954 (diff)
downloadpoky-9d07c736e39a9aa922630b4241eda185a19a11ea.tar.gz
image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types
The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate wic. As such, they provide some similar underlying functionality in order to produce a "disk" image that in turn can be converted into different formats that various hypervisor types work with. They do not however provide the ability for other disk image types to be converted into these same output types. Furthermore, they are less flexible than what wic does provide. This drops the old style vmdk/vdi/qcow2 types and re-introduces them under the CONVERSION_CMD framework. The equivalent of vmdk is now wic.vmdk and so forth for the other types. (From OE-Core rev: 929ba563f1bc7195c4981b8e139c432b2cc388ea) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/runqemu9
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/runqemu b/scripts/runqemu
index 239c48ffac..fd2717ec87 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -96,11 +96,11 @@ Examples:
96 runqemu qemux86-64 core-image-sato ext4 96 runqemu qemux86-64 core-image-sato ext4
97 runqemu qemux86-64 wic-image-minimal wic 97 runqemu qemux86-64 wic-image-minimal wic
98 runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial 98 runqemu path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial
99 runqemu qemux86 iso/hddimg/vmdk/qcow2/vdi/ramfs/cpio.gz... 99 runqemu qemux86 iso/hddimg/wic.vmdk/wic.qcow2/wic.vdi/ramfs/cpio.gz...
100 runqemu qemux86 qemuparams="-m 256" 100 runqemu qemux86 qemuparams="-m 256"
101 runqemu qemux86 bootparams="psplash=false" 101 runqemu qemux86 bootparams="psplash=false"
102 runqemu path/to/<image>-<machine>.vmdk
103 runqemu path/to/<image>-<machine>.wic 102 runqemu path/to/<image>-<machine>.wic
103 runqemu path/to/<image>-<machine>.wic.vmdk
104""") 104""")
105 105
106def check_tun(): 106def check_tun():
@@ -220,7 +220,8 @@ class BaseConfig(object):
220 self.snapshot = False 220 self.snapshot = False
221 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs', 221 self.fstypes = ('ext2', 'ext3', 'ext4', 'jffs2', 'nfs', 'btrfs',
222 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz') 222 'cpio.gz', 'cpio', 'ramfs', 'tar.bz2', 'tar.gz')
223 self.vmtypes = ('hddimg', 'hdddirect', 'wic', 'vmdk', 'qcow2', 'vdi', 'iso') 223 self.vmtypes = ('hddimg', 'hdddirect', 'wic', 'wic.vmdk',
224 'wic.qcow2', 'wic.vdi', 'iso')
224 self.network_device = "-device e1000,netdev=net0,mac=@MAC@" 225 self.network_device = "-device e1000,netdev=net0,mac=@MAC@"
225 # Use different mac section for tap and slirp to avoid 226 # Use different mac section for tap and slirp to avoid
226 # conflicts, e.g., when one is running with tap, the other is 227 # conflicts, e.g., when one is running with tap, the other is
@@ -987,6 +988,8 @@ class BaseConfig(object):
987 def setup_rootfs(self): 988 def setup_rootfs(self):
988 if self.get('QB_ROOTFS') == 'none': 989 if self.get('QB_ROOTFS') == 'none':
989 return 990 return
991 if 'wic.' in self.fstype:
992 self.fstype = self.fstype[4:]
990 rootfs_format = self.fstype if self.fstype in ('vmdk', 'qcow2', 'vdi') else 'raw' 993 rootfs_format = self.fstype if self.fstype in ('vmdk', 'qcow2', 'vdi') else 'raw'
991 994
992 qb_rootfs_opt = self.get('QB_ROOTFS_OPT') 995 qb_rootfs_opt = self.get('QB_ROOTFS_OPT')