From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 7062963440528130048
X-Received: by 2002:a5d:5983:0:b0:1e5:7dd6:710 with SMTP id n3-20020a5d5983000000b001e57dd60710mr6471338wri.392.1645196182044;
        Fri, 18 Feb 2022 06:56:22 -0800 (PST)
X-BeenThere: isar-users@googlegroups.com
Received: by 2002:a05:6000:1acd:b0:1e3:374d:d14a with SMTP id
 i13-20020a0560001acd00b001e3374dd14als105414wry.3.gmail; Fri, 18 Feb 2022
 06:56:21 -0800 (PST)
X-Google-Smtp-Source: ABdhPJz3hzUHlcsBVWGaFA1hJD0qvzJ5DJ/ztitPLyxgddF7+edQcgPW8LEgAPHivBI/fbLET2uH
X-Received: by 2002:a05:6000:1449:b0:1e8:a5b2:8574 with SMTP id v9-20020a056000144900b001e8a5b28574mr6187467wrx.560.1645196181156;
        Fri, 18 Feb 2022 06:56:21 -0800 (PST)
ARC-Seal: i=1; a=rsa-sha256; t=1645196181; cv=none;
        d=google.com; s=arc-20160816;
        b=JRvH3S11BGvhid9ABm5j/lpJYMgEvtiakD8i0Ec7M9o6mlmc5D4mweo/mmBF/PNy1o
         /JOS3G9vdvRur8RWsKVdtxxQO2oRqgRgBMpN+xNb2Ab+W1FsBnGgm9dAYLS9yP+KnlqK
         bBIliPApXp2clKuA/DjuJ1HEB6lmE2uZ3cmWt/pG4cb9ZJtRc7FJ+M1fQdAUkhYCIruJ
         oTFWJBbU4g/dPrml5DrP4H3+JL1ESQ7cDeKRXm5bOC0ssObB190EnK0Kl5QFbL8efEk7
         YYsfXxx+e9iqy+0Av2yz7WMafAX9PaeRT79Ds38Rf+/56je1aWiMNm8RWfg5ucJt2uZy
         UTSA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
        h=content-transfer-encoding:in-reply-to:from:references:to
         :content-language:subject:user-agent:mime-version:date:message-id;
        bh=MKrFI3kmnMTpZxpkeCVuE87CP7/coODvzPbDs1hxrxE=;
        b=IkhFEESoPZKQ/UpbB0nYzawaUp/VEw36yt3q0S++KZHrCRDwS1/LTU3cYzNrCv6kH/
         hYomjrFVINXKHPE3EIu3JhSikDx5NbcUqYMHavZ/gyqhAGb622yoZJReyUVIJ6MLEgPa
         A721UjwWY93Vknj7QoCHvtqRN/TW0J9m4x/qcBoBc5AihJMxHHk+siieM1ZqHi0OhseJ
         VL76Y6jUm75fQd83T9WYiB0F0Ra1I3JkBVMgd7HbU2NgeKzg2AsFcuz8J4Qij3a6+Aue
         B4gHTTBcXeT4zIaKlgiAgut3/sHuK6H+DTGT8BChfUX+LniRoWSSwoMNgRXNZOx640WJ
         iCXQ==
ARC-Authentication-Results: i=1; gmr-mx.google.com;
       spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de
Return-Path: <amikan@ilbers.de>
Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166])
        by gmr-mx.google.com with ESMTPS id ay37si283877wmb.2.2022.02.18.06.56.21
        for <isar-users@googlegroups.com>
        (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256);
        Fri, 18 Feb 2022 06:56:21 -0800 (PST)
Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166;
Authentication-Results: gmr-mx.google.com;
       spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de
Received: from [127.0.0.1] (host-80-81-17-52.static.customer.m-online.net [80.81.17.52])
	(authenticated bits=0)
	by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8) with ESMTPSA id 21IEuIvG003148
	(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT);
	Fri, 18 Feb 2022 15:56:20 +0100
Message-ID: <0ed4c093-f046-0cce-dcec-fb0d688f7d9b@ilbers.de>
Date: Fri, 18 Feb 2022 17:56:18 +0300
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.5.0
Subject: Re: [PATCH 5/6] imagetypes: switch meta-isar to the new scheme
Content-Language: en-US
To: Adriaan Schmidt <adriaan.schmidt@siemens.com>, isar-users@googlegroups.com
References: <20220210062446.4145565-1-adriaan.schmidt@siemens.com>
 <20220210062446.4145565-6-adriaan.schmidt@siemens.com>
From: Anton Mikanovich <amikan@ilbers.de>
In-Reply-To: <20220210062446.4145565-6-adriaan.schmidt@siemens.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED
	autolearn=unavailable autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de
X-TUID: m1pE7JTdt2ol

10.02.2022 09:24, Adriaan Schmidt wrote:
> - new image type names, basically replacing wic-img with wic, etc.
> - adapt custom image type rpi-sdimg to the new scheme
>
> Signed-off-by: Adriaan Schmidt <adriaan.schmidt@siemens.com>
> ---
>   meta-isar/classes/rpi-sdimg.bbclass                   | 10 ++++------
>   meta-isar/classes/ubi-ubifs-img.bbclass               | 11 ++++++++---
>   meta-isar/conf/machine/bananapi.conf                  |  2 +-
>   meta-isar/conf/machine/container-amd64.conf           |  2 +-
>   meta-isar/conf/machine/de0-nano-soc.conf              |  2 +-
>   meta-isar/conf/machine/hikey.conf                     |  2 +-
>   meta-isar/conf/machine/imx6-sabrelite.conf            |  3 ++-
>   meta-isar/conf/machine/nanopi-neo.conf                |  2 +-
>   meta-isar/conf/machine/phyboard-mira.conf             |  3 ++-
>   meta-isar/conf/machine/qemuamd64.conf                 |  2 +-
>   meta-isar/conf/machine/qemuarm.conf                   |  2 +-
>   meta-isar/conf/machine/qemuarm64.conf                 |  2 +-
>   meta-isar/conf/machine/qemui386.conf                  |  2 +-
>   meta-isar/conf/machine/qemumipsel.conf                |  2 +-
>   meta-isar/conf/machine/qemuriscv64.conf               |  2 +-
>   meta-isar/conf/machine/rpi-common.conf                |  1 +
>   meta-isar/conf/machine/rpi.conf                       |  1 +
>   meta-isar/conf/machine/sifive-fu540.conf              |  2 +-
>   meta-isar/conf/machine/stm32mp15x.conf                |  2 +-
>   meta-isar/conf/machine/virtualbox.conf                |  2 +-
>   meta-isar/conf/machine/vmware.conf                    |  2 +-
>   .../conf/multiconfig/qemuamd64-buster-cpiogz.conf     |  2 +-
>   meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf  |  2 +-
>   meta-isar/conf/multiconfig/qemuamd64-buster.conf      |  2 +-
>   meta-isar/recipes-core/images/isar-image-ubi.bb       |  4 ++--
>   25 files changed, 38 insertions(+), 31 deletions(-)
>
> diff --git a/meta-isar/classes/rpi-sdimg.bbclass b/meta-isar/classes/rpi-sdimg.bbclass
> index 1efc1c40..747b78de 100644
> --- a/meta-isar/classes/rpi-sdimg.bbclass
> +++ b/meta-isar/classes/rpi-sdimg.bbclass
> @@ -3,7 +3,7 @@
>   #
>   # Based on SD class from meta-raspberrypi
>   
> -inherit ext4-img
> +IMAGE_TYPEDEP_rpi_sdimg = "ext4"
>   
>   # Boot partition volume id
>   BOOTDD_VOLUME_ID ?= "${MACHINE}"
> @@ -14,10 +14,10 @@ BOOT_SPACE ?= "40960"
>   # Set alignment to 4MB [in KiB]
>   IMAGE_ROOTFS_ALIGNMENT = "4096"
>   
> -SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.sdimg"
> -SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${EXT4_IMAGE_FILE}"
> +SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.rpi-sdimg"
> +SDIMG_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ext4"
>   
> -do_rpi_sdimg () {
> +IMAGE_CMD_rpi_sdimg () {
>       # Align partitions
>       ROOTFS_SIZE=$(du -b ${SDIMG_ROOTFS} | cut -f 1)
>       ROOTFS_SIZE=$(expr ${ROOTFS_SIZE} + 1)
> @@ -53,5 +53,3 @@ do_rpi_sdimg () {
>       dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
>       dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
>   }
> -
> -addtask rpi_sdimg before do_build after do_ext4_image
> diff --git a/meta-isar/classes/ubi-ubifs-img.bbclass b/meta-isar/classes/ubi-ubifs-img.bbclass
> index 095719aa..7a917b47 100644
> --- a/meta-isar/classes/ubi-ubifs-img.bbclass
> +++ b/meta-isar/classes/ubi-ubifs-img.bbclass
> @@ -5,6 +5,11 @@
>   #
>   # SPDX-License-Identifier: MIT
>   
> -inherit ubi-img ubifs-img fit-img
> -addtask do_ubi_image after do_ubifs_image
> -addtask do_ubi_image after do_fit_image
> +IMAGE_TYPEDEP_ubi_ubifs = "ubi"
> +IMAGE_TYPEDEP_ubi += "ubifs fit"
> +
> +IMAGE_CMD_ubi_ubifs() {
> +    # we need to produce output (with extension .ubi-ubifs),
> +    # so just create a symlink
> +    ln -sf ${IMAGE_FULLNAME}.ubi ${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.ubi-ubifs
> +}
> diff --git a/meta-isar/conf/machine/bananapi.conf b/meta-isar/conf/machine/bananapi.conf
> index dd3a0667..36cda28a 100644
> --- a/meta-isar/conf/machine/bananapi.conf
> +++ b/meta-isar/conf/machine/bananapi.conf
> @@ -9,6 +9,6 @@ KERNEL_NAME ?= "armmp"
>   
>   IMAGE_INSTALL += "u-boot-script"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "bananapi"
>   IMAGER_INSTALL += "u-boot-sunxi"
> diff --git a/meta-isar/conf/machine/container-amd64.conf b/meta-isar/conf/machine/container-amd64.conf
> index 1f7669ad..e24729ff 100644
> --- a/meta-isar/conf/machine/container-amd64.conf
> +++ b/meta-isar/conf/machine/container-amd64.conf
> @@ -4,4 +4,4 @@
>   # SPDX-License-Identifier: MIT
>   
>   DISTRO_ARCH ?= "amd64"
> -IMAGE_FSTYPES ?= "container-img"
> +IMAGE_FSTYPES ?= "docker-archive.gz"
> diff --git a/meta-isar/conf/machine/de0-nano-soc.conf b/meta-isar/conf/machine/de0-nano-soc.conf
> index f822e24b..55343e9f 100644
> --- a/meta-isar/conf/machine/de0-nano-soc.conf
> +++ b/meta-isar/conf/machine/de0-nano-soc.conf
> @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-de0-nano-soc = "u-boot-de0-nano-soc"
>   U_BOOT_CONFIG_de0-nano-soc = "socfpga_de0_nano_soc_defconfig"
>   U_BOOT_BIN_de0-nano-soc = "u-boot-with-spl.sfp"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "de0-nano-soc.wks.in"
>   IMAGER_INSTALL += "u-boot-de0-nano-soc"
>   IMAGER_BUILD_DEPS += "u-boot-de0-nano-soc"
> diff --git a/meta-isar/conf/machine/hikey.conf b/meta-isar/conf/machine/hikey.conf
> index 615d6749..7f9cccb2 100644
> --- a/meta-isar/conf/machine/hikey.conf
> +++ b/meta-isar/conf/machine/hikey.conf
> @@ -7,7 +7,7 @@ DISTRO_ARCH = "arm64"
>   
>   KERNEL_NAME ?= "mainline"
>   
> -IMAGE_FSTYPES = "wic-img"
> +IMAGE_FSTYPES = "wic"
>   WKS_FILE ?= "hikey"
>   IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
>   
> diff --git a/meta-isar/conf/machine/imx6-sabrelite.conf b/meta-isar/conf/machine/imx6-sabrelite.conf
> index 5be337f9..bbc2b505 100644
> --- a/meta-isar/conf/machine/imx6-sabrelite.conf
> +++ b/meta-isar/conf/machine/imx6-sabrelite.conf
> @@ -6,8 +6,9 @@
>   MACHINE_SERIAL ?= "ttymxc0"
>   BAUDRATE_TTY ?= "115200"
>   
> +INHERIT += "ubi-ubifs-img"
>   MKUBIFS_ARGS := "-m 0x1000 -e 0x3e000 -c 1500"
>   UBINIZE_ARGS = "-vv -m 0x1000 -p 0x40000"
> -IMAGE_FSTYPES ?= "ubi-ubifs-img"
> +IMAGE_FSTYPES ?= "ubi-ubifs"
>   
>   DTB_FILES = "imx6q-sabrelite.dtb"

Why not just set IMAGE_FSTYPES ?= "ubi ubifs" here, move image deps to
machine configs and remove ubi-ubifs image type completely?

> diff --git a/meta-isar/conf/machine/nanopi-neo.conf b/meta-isar/conf/machine/nanopi-neo.conf
> index 2475ce9d..5aa717e5 100644
> --- a/meta-isar/conf/machine/nanopi-neo.conf
> +++ b/meta-isar/conf/machine/nanopi-neo.conf
> @@ -7,7 +7,7 @@ DISTRO_ARCH ?= "armhf"
>   
>   KERNEL_NAME ?= "armmp"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "nanopi-neo.wks.in"
>   
>   IMAGE_INSTALL += "u-boot-script"
> diff --git a/meta-isar/conf/machine/phyboard-mira.conf b/meta-isar/conf/machine/phyboard-mira.conf
> index 2d052d0c..65382630 100644
> --- a/meta-isar/conf/machine/phyboard-mira.conf
> +++ b/meta-isar/conf/machine/phyboard-mira.conf
> @@ -6,8 +6,9 @@
>   MACHINE_SERIAL ?= "ttymxc0"
>   BAUDRATE_TTY ?= "115200"
>   
> +INHERIT += "ubi-ubifs-img"
>   MKUBIFS_ARGS := "-m 0x1000 -e 0x7e000 -c 8083"
>   UBINIZE_ARGS = "-vv -m 0x1000 -p 0x80000"
> -IMAGE_FSTYPES ?= "ubi-ubifs-img"
> +IMAGE_FSTYPES ?= "ubi-ubifs"
>   
>   DTB_FILES = "imx6q-phytec-mira-rdk-nand.dtb"
> diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
> index ccfde391..eca2628c 100644
> --- a/meta-isar/conf/machine/qemuamd64.conf
> +++ b/meta-isar/conf/machine/qemuamd64.conf
> @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "amd64"
>   KERNEL_NAME ?= "amd64"
>   KERNEL_NAME_ubuntu-focal ?= "generic"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "sdimage-efi"
>   IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
>   
> diff --git a/meta-isar/conf/machine/qemuarm.conf b/meta-isar/conf/machine/qemuarm.conf
> index 20a71ea4..06d4b34d 100644
> --- a/meta-isar/conf/machine/qemuarm.conf
> +++ b/meta-isar/conf/machine/qemuarm.conf
> @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "armhf"
>   
>   KERNEL_NAME ?= "armmp"
>   
> -IMAGE_FSTYPES ?= "ext4-img"
> +IMAGE_FSTYPES ?= "ext4"
>   
>   QEMU_ROOTFS_DEV ?= "vda"
>   
> diff --git a/meta-isar/conf/machine/qemuarm64.conf b/meta-isar/conf/machine/qemuarm64.conf
> index ca23cef5..b30fad47 100644
> --- a/meta-isar/conf/machine/qemuarm64.conf
> +++ b/meta-isar/conf/machine/qemuarm64.conf
> @@ -6,7 +6,7 @@ DISTRO_ARCH ?= "arm64"
>   KERNEL_NAME ?= "arm64"
>   KERNEL_NAME_ubuntu-focal ?= "generic"
>   
> -IMAGE_FSTYPES ?= "ext4-img"
> +IMAGE_FSTYPES ?= "ext4"
>   
>   QEMU_ROOTFS_DEV ?= "vda"
>   
> diff --git a/meta-isar/conf/machine/qemui386.conf b/meta-isar/conf/machine/qemui386.conf
> index 17cff1eb..ddfc077b 100644
> --- a/meta-isar/conf/machine/qemui386.conf
> +++ b/meta-isar/conf/machine/qemui386.conf
> @@ -4,7 +4,7 @@ DISTRO_ARCH ?= "i386"
>   
>   KERNEL_NAME ?= "686-pae"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "directdisk-isar"
>   IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}"
>   
> diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
> index b34e46de..40f5e744 100644
> --- a/meta-isar/conf/machine/qemumipsel.conf
> +++ b/meta-isar/conf/machine/qemumipsel.conf
> @@ -5,7 +5,7 @@ DISTRO_ARCH ?= "mipsel"
>   
>   KERNEL_NAME ?= "4kc-malta"
>   
> -IMAGE_FSTYPES ?= "ext4-img"
> +IMAGE_FSTYPES ?= "ext4"
>   
>   QEMU_ROOTFS_DEV ?= "sda"
>   
> diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
> index 5c687a03..cd04d873 100644
> --- a/meta-isar/conf/machine/qemuriscv64.conf
> +++ b/meta-isar/conf/machine/qemuriscv64.conf
> @@ -8,7 +8,7 @@ DISTRO_ARCH ?= "riscv64"
>   
>   KERNEL_NAME ?= "riscv64"
>   
> -IMAGE_FSTYPES ?= "ext4-img"
> +IMAGE_FSTYPES ?= "ext4"
>   
>   QEMU_ROOTFS_DEV ?= "vda"
>   
> diff --git a/meta-isar/conf/machine/rpi-common.conf b/meta-isar/conf/machine/rpi-common.conf
> index bb0b939c..e4652340 100644
> --- a/meta-isar/conf/machine/rpi-common.conf
> +++ b/meta-isar/conf/machine/rpi-common.conf
> @@ -5,6 +5,7 @@ BOOT_SPACE ?= "81920"
>   MACHINE_SERIAL ?= "serial0"
>   BAUDRATE_TTY ?= "115200"
>   
> +IMAGE_CLASSES += "rpi-sdimg"
>   IMAGE_FSTYPES ?= "rpi-sdimg"
>   
>   KERNEL_TYPE = "raspios"
> diff --git a/meta-isar/conf/machine/rpi.conf b/meta-isar/conf/machine/rpi.conf
> index 61852a9b..0a980926 100644
> --- a/meta-isar/conf/machine/rpi.conf
> +++ b/meta-isar/conf/machine/rpi.conf
> @@ -4,4 +4,5 @@
>   MACHINE_SERIAL ?= "ttyAMA0"
>   BAUDRATE_TTY ?= "9600"
>   
> +IMAGE_CLASSES += "rpi-sdimg"
>   IMAGE_FSTYPES ?= "rpi-sdimg"
> diff --git a/meta-isar/conf/machine/sifive-fu540.conf b/meta-isar/conf/machine/sifive-fu540.conf
> index d73f0475..1eb58db1 100644
> --- a/meta-isar/conf/machine/sifive-fu540.conf
> +++ b/meta-isar/conf/machine/sifive-fu540.conf
> @@ -7,7 +7,7 @@ DISTRO_ARCH = "riscv64"
>   
>   KERNEL_NAME ?= "mainline"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "sifive-fu540"
>   IMAGER_INSTALL += "opensbi-sifive-fu540"
>   IMAGER_BUILD_DEPS += "opensbi-sifive-fu540"
> diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf
> index 22e88ea9..62de7dd1 100644
> --- a/meta-isar/conf/machine/stm32mp15x.conf
> +++ b/meta-isar/conf/machine/stm32mp15x.conf
> @@ -11,7 +11,7 @@ PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x"
>   U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig"
>   U_BOOT_BIN_stm32mp15x = "u-boot.stm32"
>   
> -IMAGE_FSTYPES ?= "wic-img"
> +IMAGE_FSTYPES ?= "wic"
>   WKS_FILE ?= "stm32mp15x.wks.in"
>   IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x"
>   IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x"
> diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf
> index c0f65842..de3d04c3 100644
> --- a/meta-isar/conf/machine/virtualbox.conf
> +++ b/meta-isar/conf/machine/virtualbox.conf
> @@ -12,4 +12,4 @@ WKS_FILE ?= "sdimage-efi"
>   IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
>   
>   VMDK_SUBFORMAT = "monolithicSparse"
> -IMAGE_FSTYPES ?= "vm-img"
> +IMAGE_FSTYPES ?= "ova"
> diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf
> index 9bf1fd96..fba639b1 100644
> --- a/meta-isar/conf/machine/vmware.conf
> +++ b/meta-isar/conf/machine/vmware.conf
> @@ -14,4 +14,4 @@ IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
>   OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl"
>   
>   VMDK_SUBFORMAT = "streamOptimized"
> -IMAGE_FSTYPES ?= "vm-img"
> +IMAGE_FSTYPES ?= "ova"
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
> index 37f89581..675d934a 100644
> --- a/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-cpiogz.conf
> @@ -6,4 +6,4 @@
>   MACHINE ?= "qemuamd64"
>   DISTRO ?= "debian-buster"
>   
> -IMAGE_FSTYPES = "cpiogz-img"
> +IMAGE_FSTYPES = "cpio.gz"
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> index e3992e60..b48b0a6c 100644
> --- a/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster-tgz.conf
> @@ -6,4 +6,4 @@
>   MACHINE ?= "qemuamd64"
>   DISTRO ?= "debian-buster"
>   
> -IMAGE_FSTYPES ?= "targz-img"
> +IMAGE_FSTYPES ?= "tar.gz"
> diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> index 5615198d..1765d602 100644
> --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf
> @@ -3,4 +3,4 @@
>   MACHINE ?= "qemuamd64"
>   DISTRO ?= "debian-buster"
>   
> -IMAGE_FSTYPES ?= "wic-img ext4-img"
> +IMAGE_FSTYPES ?= "wic ext4"
> diff --git a/meta-isar/recipes-core/images/isar-image-ubi.bb b/meta-isar/recipes-core/images/isar-image-ubi.bb
> index ef2cf1c3..8c70c1f7 100644
> --- a/meta-isar/recipes-core/images/isar-image-ubi.bb
> +++ b/meta-isar/recipes-core/images/isar-image-ubi.bb
> @@ -23,5 +23,5 @@ INITRD_IMG = "${PP_DEPLOY}/${INITRD_IMAGE}"
>   # only one dtb file supported, pick the first
>   DTB_IMG = "${PP_DEPLOY}/${@(d.getVar('DTB_FILES').split() or [''])[0]}"
>   
> -UBIFS_IMG = "${PP_DEPLOY}/${UBIFS_IMAGE_FILE}"
> -FIT_IMG = "${PP_DEPLOY}/${FIT_IMAGE_FILE}"
> +UBIFS_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.ubifs"
> +FIT_IMG = "${PP_DEPLOY}/${IMAGE_FULLNAME}.fit"