diff options
Diffstat (limited to 'meta/classes/image_types.bbclass')
-rw-r--r-- | meta/classes/image_types.bbclass | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 5b48a09da4..f756c39fc3 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -18,9 +18,13 @@ def get_imagecmds(d): | |||
18 | cimages[basetype].append(ctype) | 18 | cimages[basetype].append(ctype) |
19 | break | 19 | break |
20 | 20 | ||
21 | # Live images will be processed via inheriting bbclass and | 21 | # Live and VMDK images will be processed via inheriting |
22 | # does not get processed here. | 22 | # bbclass and does not get processed here. |
23 | # live images also depend on ext3 so ensure its present | 23 | # vmdk depend on live images also depend on ext3 so ensure its present |
24 | if "vmdk" in types: | ||
25 | if "ext3" not in types: | ||
26 | types.append("ext3") | ||
27 | types.remove("vmdk") | ||
24 | if "live" in types: | 28 | if "live" in types: |
25 | if "ext3" not in types: | 29 | if "ext3" not in types: |
26 | types.append("ext3") | 30 | types.append("ext3") |
@@ -75,6 +79,8 @@ def imagetypes_getdepends(d): | |||
75 | deps = [] | 79 | deps = [] |
76 | ctypes = d.getVar('COMPRESSIONTYPES', True).split() | 80 | ctypes = d.getVar('COMPRESSIONTYPES', True).split() |
77 | for type in (d.getVar('IMAGE_FSTYPES', True) or "").split(): | 81 | for type in (d.getVar('IMAGE_FSTYPES', True) or "").split(): |
82 | if type == "vmdk" or type == "live": | ||
83 | type = "ext3" | ||
78 | basetype = type | 84 | basetype = type |
79 | for ctype in ctypes: | 85 | for ctype in ctypes: |
80 | if type.endswith("." + ctype): | 86 | if type.endswith("." + ctype): |
@@ -160,8 +166,6 @@ IMAGE_CMD_ubi () { | |||
160 | } | 166 | } |
161 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" | 167 | IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}" |
162 | 168 | ||
163 | IMAGE_CMD_vmdk = "qemu-img convert -O vmdk ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.vmdk" | ||
164 | |||
165 | EXTRA_IMAGECMD = "" | 169 | EXTRA_IMAGECMD = "" |
166 | EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000" | 170 | EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x40000" |
167 | # Change these if you want default genext2fs behavior (i.e. create minimal inode number) | 171 | # Change these if you want default genext2fs behavior (i.e. create minimal inode number) |
@@ -181,7 +185,6 @@ IMAGE_DEPENDS_squashfs = "squashfs-tools-native" | |||
181 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" | 185 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" |
182 | IMAGE_DEPENDS_ubi = "mtd-utils-native" | 186 | IMAGE_DEPENDS_ubi = "mtd-utils-native" |
183 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" | 187 | IMAGE_DEPENDS_ubifs = "mtd-utils-native" |
184 | IMAGE_DEPENDS_vmdk = "qemu-native" | ||
185 | 188 | ||
186 | # This variable is available to request which values are suitable for IMAGE_FSTYPES | 189 | # This variable is available to request which values are suitable for IMAGE_FSTYPES |
187 | IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma vmdk" | 190 | IMAGE_TYPES = "jffs2 sum.jffs2 cramfs ext2 ext2.gz ext2.bz2 ext3 ext3.gz ext2.lzma btrfs live squashfs squashfs-lzma ubi tar tar.gz tar.bz2 tar.xz cpio cpio.gz cpio.xz cpio.lzma vmdk" |