[PATCH] imagetypes_wic: Fix riscv64 and mipsel usage

[PATCH] imagetypes_wic: Fix riscv64 and mipsel usage

['Jan Kiszka' via isar-users]

From: Jan Kiszka <jan.kiszka@siemens.com>

We must no set WKS_FILE via overrides in a central file as it will take
precedence over regular assignments that users rightfully expect to
work.

Fixes: 0a7f631f06b6 ("wic: Set default WKS_FILE for non efi targets")
Reported-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Finally noticed in isar-cip-core where we are unfortunately not yet 
runtime testing the isar riscv64 image.

 meta-isar/conf/machine/qemumipsel.conf  | 3 +++
 meta-isar/conf/machine/qemuriscv64.conf | 3 +++
 meta/classes/imagetypes_wic.bbclass     | 3 ---
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
index 4c27ff2f..ceac81b8 100644
--- a/meta-isar/conf/machine/qemumipsel.conf
+++ b/meta-isar/conf/machine/qemumipsel.conf
@@ -8,6 +8,9 @@ KERNEL_NAME ?= "4kc-malta"
 IMAGE_FSTYPES ?= "ext4"
 ROOTFS_EXTRA ?= "128"
 
+# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
+WKS_FILE ?= "qemudefault"
+
 QEMU_ROOTFS_DEV ?= "sda"
 
 QEMU_ARCH ?= "mipsel"
diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
index 15711054..b9656090 100644
--- a/meta-isar/conf/machine/qemuriscv64.conf
+++ b/meta-isar/conf/machine/qemuriscv64.conf
@@ -11,6 +11,9 @@ KERNEL_NAME ?= "riscv64"
 IMAGE_FSTYPES ?= "ext4"
 ROOTFS_EXTRA ?= "128"
 
+# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
+WKS_FILE ?= "qemuriscv"
+
 QEMU_ROOTFS_DEV ?= "vda"
 
 QEMU_ARCH ?= "riscv64"
diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
index 980856ac..38b5f0e1 100644
--- a/meta/classes/imagetypes_wic.bbclass
+++ b/meta/classes/imagetypes_wic.bbclass
@@ -8,9 +8,6 @@ USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}"
 WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if bb.utils.to_boolean(d.getVar('USING_WIC')) else ''}"
 
 WKS_FILE ??= "sdimage-efi"
-# grub-efi is incompatible with targets riscv64 and mipsel
-WKS_FILE:riscv64 ??= "qemuriscv"
-WKS_FILE:mipsel ??= "qemudefault"
 
 do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}"
 do_copy_wks_template[vardepsexclude] += "WKS_TEMPLATE_PATH"
-- 
2.43.0

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/97ad9368-43f1-435a-b5fb-d496fba86741%40siemens.com.

Re: [PATCH] imagetypes_wic: Fix riscv64 and mipsel usage

[Anton Mikanovich]

17/01/2025 15:20, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> We must no set WKS_FILE via overrides in a central file as it will take
> precedence over regular assignments that users rightfully expect to
> work.
>
> Fixes: 0a7f631f06b6 ("wic: Set default WKS_FILE for non efi targets")
> Reported-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Finally noticed in isar-cip-core where we are unfortunately not yet
> runtime testing the isar riscv64 image.
>
>   meta-isar/conf/machine/qemumipsel.conf  | 3 +++
>   meta-isar/conf/machine/qemuriscv64.conf | 3 +++
>   meta/classes/imagetypes_wic.bbclass     | 3 ---
>   3 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/meta-isar/conf/machine/qemumipsel.conf b/meta-isar/conf/machine/qemumipsel.conf
> index 4c27ff2f..ceac81b8 100644
> --- a/meta-isar/conf/machine/qemumipsel.conf
> +++ b/meta-isar/conf/machine/qemumipsel.conf
> @@ -8,6 +8,9 @@ KERNEL_NAME ?= "4kc-malta"
>   IMAGE_FSTYPES ?= "ext4"
>   ROOTFS_EXTRA ?= "128"
>   
> +# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
There is a typo: riscv64 -> mipsel.
> +WKS_FILE ?= "qemudefault"
> +
>   QEMU_ROOTFS_DEV ?= "sda"
>   
>   QEMU_ARCH ?= "mipsel"
> diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf
> index 15711054..b9656090 100644
> --- a/meta-isar/conf/machine/qemuriscv64.conf
> +++ b/meta-isar/conf/machine/qemuriscv64.conf
> @@ -11,6 +11,9 @@ KERNEL_NAME ?= "riscv64"
>   IMAGE_FSTYPES ?= "ext4"
>   ROOTFS_EXTRA ?= "128"
>   
> +# grub-efi is incompatible with targets riscv64, thus no sdimage-efi default
> +WKS_FILE ?= "qemuriscv"
> +
>   QEMU_ROOTFS_DEV ?= "vda"
>   
>   QEMU_ARCH ?= "riscv64"
> diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
> index 980856ac..38b5f0e1 100644
> --- a/meta/classes/imagetypes_wic.bbclass
> +++ b/meta/classes/imagetypes_wic.bbclass
> @@ -8,9 +8,6 @@ USING_WIC = "${@bb.utils.contains('IMAGE_BASETYPES', 'wic', '1', '0', d)}"
>   WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if bb.utils.to_boolean(d.getVar('USING_WIC')) else ''}"
>   
>   WKS_FILE ??= "sdimage-efi"
> -# grub-efi is incompatible with targets riscv64 and mipsel
> -WKS_FILE:riscv64 ??= "qemuriscv"
> -WKS_FILE:mipsel ??= "qemudefault"
>   
>   do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}"
>   do_copy_wks_template[vardepsexclude] += "WKS_TEMPLATE_PATH"


-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/d5c34eda-9fc5-4abe-b5ba-f8fe7e4d7ed0%40ilbers.de.