[PATCH 0/2] Additions to imagetypes patchset

[PATCH 0/2] Additions to imagetypes patchset

[Anton Mikanovich]

There are two patches should be placed between imagetypes update and
ubi/ubifs rebuild patchset to make CI work correctly.

Anton Mikanovich (2):
  start_vm: update image types checking
  meta: fix wic image generation for qemuamd64-bullseye

 meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 +-
 scripts/start_vm                                   | 8 ++++----
 testsuite/start_vm.py                              | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

-- 
2.17.1

[PATCH 1/2] start_vm: update image types checking

[Anton Mikanovich]

Image types checking in start_vm should be aligned with code updates.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 scripts/start_vm      | 8 ++++----
 testsuite/start_vm.py | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/start_vm b/scripts/start_vm
index c114d86..8876e53 100755
--- a/scripts/start_vm
+++ b/scripts/start_vm
@@ -113,8 +113,8 @@ eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "\(^IMAGE_FSTYPES=
 # Take first image type for VM if there are several defined
 IMAGE_FSTYPES=$(echo "$IMAGE_FSTYPES" | awk '{print $1}')
 case "$IMAGE_FSTYPES" in
-    ext4-img)
-    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4.img
+    ext4)
+    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.ext4
 
     eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^KERNEL_IMAGE=")
     eval $(bitbake -e mc:qemu$ARCH-$DISTRO:isar-image-base | grep "^INITRD_IMAGE=")
@@ -130,8 +130,8 @@ case "$IMAGE_FSTYPES" in
 	-initrd $QINITRD"
     KARGS="console=$MACHINE_SERIAL root=/dev/$QEMU_ROOTFS_DEV rw $QEMU_KARGS"
     ;;
-    wic-img)
-    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic.img
+    wic)
+    readonly ROOTFS_IMAGE=$IMAGE_FULLNAME.wic
     EXTRA_ARGS="$EXTRA_ARGS -snapshot"
     ;;
     *)
diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py
index 708520f..f761a8b 100755
--- a/testsuite/start_vm.py
+++ b/testsuite/start_vm.py
@@ -31,8 +31,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False):
     image_type = get_bitbake_var(bb_output, 'IMAGE_FSTYPES').split()[0]
     deploy_dir_image = get_bitbake_var(bb_output, 'DEPLOY_DIR_IMAGE')
     base = 'ubuntu' if distro in ['focal', 'bionic'] else 'debian'
-    if image_type == 'ext4-img':
-        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4.img'
+    if image_type == 'ext4':
+        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.ext4'
         kernel_image = deploy_dir_image + '/' + get_bitbake_var(bb_output, 'KERNEL_IMAGE')
         initrd_image = get_bitbake_var(bb_output, 'INITRD_IMAGE')
 
@@ -47,8 +47,8 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False):
 
         extra_args = ['-kernel', kernel_image, '-initrd', initrd_image]
         extra_args.extend(kargs)
-    elif image_type == 'wic-img':
-        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic.img'
+    elif image_type == 'wic':
+        rootfs_image = 'isar-image-base-' + base + '-' + distro + '-qemu' + arch + '.wic'
         extra_args = ['-snapshot']
     else:
         raise ValueError('Invalid image type: ' + str(image_type))
-- 
2.17.1

[PATCH 2/2] meta: fix wic image generation for qemuamd64-bullseye

[Anton Mikanovich]

Adding new image types on multiconfig layer should be done in _append
style to not overwrite default value.

Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
---
 meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
index 5c8cfd3..13d870d 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
@@ -3,4 +3,4 @@
 MACHINE ?= "qemuamd64"
 DISTRO ?= "debian-bullseye"
 
-IMAGE_FSTYPES += "cpio.gz tar.gz"
+IMAGE_FSTYPES_append = " cpio.gz tar.gz"
-- 
2.17.1

RE: [PATCH 0/2] Additions to imagetypes patchset

[Schmidt, Adriaan]

Anton Mikanovich, Mittwoch, 27. April 2022 20:57:
> There are two patches should be placed between imagetypes update and
> ubi/ubifs rebuild patchset to make CI work correctly.

Hi Anton,
Looks good!
I'm appending p1 to the imagetypes series for v4 (which I'm preparing right now).
p2 fixes code I added/broke in the imagetypes patches, so I'll apply the fix
directly at the "source".
Thanks,
Adriaan

> 
> Anton Mikanovich (2):
>   start_vm: update image types checking
>   meta: fix wic image generation for qemuamd64-bullseye
> 
>  meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 +-
>  scripts/start_vm                                   | 8 ++++----
>  testsuite/start_vm.py                              | 8 ++++----
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> --
> 2.17.1