diff options
author | Sinan Kaya <okaya@kernel.org> | 2021-01-17 15:25:18 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-20 00:45:05 +0000 |
commit | f407293a996440e1afbe4bb32dbe7d1c5fa40d7f (patch) | |
tree | 850962aeb7727d7dcb168c99aca08dd86fb401ab /meta/classes | |
parent | 24cd0907415c70c7df31105bd9b479767f32c2b8 (diff) | |
download | poky-f407293a996440e1afbe4bb32dbe7d1c5fa40d7f.tar.gz |
meta/classes: Add supprot for WIC<>VHD/VHDX conversion
(From OE-Core rev: b57b1615d965575deb0bf164b9873fe31a4d39b4)
Signed-off-by: Sinan Kaya <okaya@kernel.org>
Co-Developed-by: Anatol Belski <anbelski@linux.microsoft.com>
Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image-live.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/image_types.bbclass | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 9ea5ddc312..1b2183eadd 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass | |||
@@ -234,7 +234,7 @@ build_hddimg() { | |||
234 | bberror "${HDDDIR}/rootfs.img rootfs size is greather than or equal to 4GB," | 234 | bberror "${HDDDIR}/rootfs.img rootfs size is greather than or equal to 4GB," |
235 | bberror "and this doesn't work on a FAT filesystem. You can either:" | 235 | bberror "and this doesn't work on a FAT filesystem. You can either:" |
236 | bberror "1) Reduce the size of rootfs.img, or," | 236 | bberror "1) Reduce the size of rootfs.img, or," |
237 | bbfatal "2) Use wic, vmdk or vdi instead of hddimg\n" | 237 | bbfatal "2) Use wic, vmdk,vhd, vhdx or vdi instead of hddimg\n" |
238 | fi | 238 | fi |
239 | fi | 239 | fi |
240 | 240 | ||
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 286009057e..c937ae4538 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
@@ -269,7 +269,7 @@ IMAGE_TYPES = " \ | |||
269 | # CONVERSION_CMD/DEPENDS. | 269 | # CONVERSION_CMD/DEPENDS. |
270 | COMPRESSIONTYPES ?= "" | 270 | COMPRESSIONTYPES ?= "" |
271 | 271 | ||
272 | CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip zst sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot vmdk vdi qcow2 base64 ${COMPRESSIONTYPES}" | 272 | CONVERSIONTYPES = "gz bz2 lzma xz lz4 lzo zip zst sum md5sum sha1sum sha224sum sha256sum sha384sum sha512sum bmap u-boot vmdk vhd vhdx vdi qcow2 base64 ${COMPRESSIONTYPES}" |
273 | CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" | 273 | CONVERSION_CMD_lzma = "lzma -k -f -7 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" |
274 | CONVERSION_CMD_gz = "gzip -f -9 -n -c --rsyncable ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" | 274 | CONVERSION_CMD_gz = "gzip -f -9 -n -c --rsyncable ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.gz" |
275 | CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" | 275 | CONVERSION_CMD_bz2 = "pbzip2 -f -k ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}" |
@@ -288,6 +288,8 @@ CONVERSION_CMD_sha512sum = "sha512sum ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} | |||
288 | CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" | 288 | CONVERSION_CMD_bmap = "bmaptool create ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} -o ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.bmap" |
289 | CONVERSION_CMD_u-boot = "mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C none -n ${IMAGE_NAME} -d ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.u-boot" | 289 | CONVERSION_CMD_u-boot = "mkimage -A ${UBOOT_ARCH} -O linux -T ramdisk -C none -n ${IMAGE_NAME} -d ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.u-boot" |
290 | CONVERSION_CMD_vmdk = "qemu-img convert -O vmdk ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk" | 290 | CONVERSION_CMD_vmdk = "qemu-img convert -O vmdk ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vmdk" |
291 | CONVERSION_CMD_vhdx = "qemu-img convert -O vhdx -o subformat=dynamic ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vhdx" | ||
292 | CONVERSION_CMD_vhd = "qemu-img convert -O vpc -o subformat=fixed ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vhd" | ||
291 | CONVERSION_CMD_vdi = "qemu-img convert -O vdi ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi" | 293 | CONVERSION_CMD_vdi = "qemu-img convert -O vdi ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.vdi" |
292 | CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2" | 294 | CONVERSION_CMD_qcow2 = "qemu-img convert -O qcow2 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.qcow2" |
293 | CONVERSION_CMD_base64 = "base64 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.base64" | 295 | CONVERSION_CMD_base64 = "base64 ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} > ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}.base64" |
@@ -306,6 +308,8 @@ CONVERSION_DEPENDS_vmdk = "qemu-system-native" | |||
306 | CONVERSION_DEPENDS_vdi = "qemu-system-native" | 308 | CONVERSION_DEPENDS_vdi = "qemu-system-native" |
307 | CONVERSION_DEPENDS_qcow2 = "qemu-system-native" | 309 | CONVERSION_DEPENDS_qcow2 = "qemu-system-native" |
308 | CONVERSION_DEPENDS_base64 = "coreutils-native" | 310 | CONVERSION_DEPENDS_base64 = "coreutils-native" |
311 | CONVERSION_DEPENDS_vhdx = "qemu-system-native" | ||
312 | CONVERSION_DEPENDS_vhd = "qemu-system-native" | ||
309 | 313 | ||
310 | RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" | 314 | RUNNABLE_IMAGE_TYPES ?= "ext2 ext3 ext4" |
311 | RUNNABLE_MACHINE_PATTERNS ?= "qemu" | 315 | RUNNABLE_MACHINE_PATTERNS ?= "qemu" |
@@ -313,7 +317,7 @@ RUNNABLE_MACHINE_PATTERNS ?= "qemu" | |||
313 | DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" | 317 | DEPLOYABLE_IMAGE_TYPES ?= "hddimg iso" |
314 | 318 | ||
315 | # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, | 319 | # The IMAGE_TYPES_MASKED variable will be used to mask out from the IMAGE_FSTYPES, |
316 | # images that will not be built at do_rootfs time: vmdk, vdi, qcow2, hddimg, iso, etc. | 320 | # images that will not be built at do_rootfs time: vmdk, vhd, vhdx, vdi, qcow2, hddimg, iso, etc. |
317 | IMAGE_TYPES_MASKED ?= "" | 321 | IMAGE_TYPES_MASKED ?= "" |
318 | 322 | ||
319 | # bmap requires python3 to be in the PATH | 323 | # bmap requires python3 to be in the PATH |