Re: [PATCH 2/2] wic: Set default WKS_FILE for non efi targets

["'Jan Kiszka' via isar-users" <isar-users@googlegroups.com>]

On 14.11.24 14:48, Anton Mikanovich wrote:
> As riscv64 and mipsel are not supported by grub-efi set other default
> WKS_FILE values for them.
> 
> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> ---
>  meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks | 5 +++++
>  meta/classes/imagetypes_wic.bbclass                  | 3 +++
>  2 files changed, 8 insertions(+)
>  create mode 100644 meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks
> 
> diff --git a/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks b/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks
> new file mode 100644
> index 00000000..02a9fdf2
> --- /dev/null
> +++ b/meta-isar/scripts/lib/wic/canned-wks/qemudefault.wks
> @@ -0,0 +1,5 @@
> +# short-description: Create qcow2 image for QEMU machines
> +
> +part / --source rootfs --fstype=ext4 --label root --align 4096 --size 4G
> +
> +bootloader
> diff --git a/meta/classes/imagetypes_wic.bbclass b/meta/classes/imagetypes_wic.bbclass
> index 3b697cdd..0a8d4b4d 100644
> --- a/meta/classes/imagetypes_wic.bbclass
> +++ b/meta/classes/imagetypes_wic.bbclass
> @@ -8,6 +8,9 @@ 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"

This part was wrong, breaking downstream layers: overrides win over
normal assignments. So,

WKS_FILE = "my-file"

will lose in the face of the above. Fixing...

Jan

-- 
Siemens AG, Foundational Technologies
Linux Expert Center

-- 
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/ab80b2ec-cee3-44e9-9ed4-127f2b17521d%40siemens.com.