public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Anton Mikanovich <amikan@ilbers.de>
To: isar-users@googlegroups.com
Cc: Anton Mikanovich <amikan@ilbers.de>
Subject: [PATCH 2/2] wic: Set default WKS_FILE for non efi targets
Date: Thu, 14 Nov 2024 15:48:29 +0200	[thread overview]
Message-ID: <20241114134829.1466035-3-amikan@ilbers.de> (raw)
In-Reply-To: <20241114134829.1466035-1-amikan@ilbers.de>

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"
 
 do_copy_wks_template[file-checksums] += "${WKS_FILE_CHECKSUM}"
 do_copy_wks_template[vardepsexclude] += "WKS_TEMPLATE_PATH"
-- 
2.34.1

-- 
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/20241114134829.1466035-3-amikan%40ilbers.de.

  parent reply	other threads:[~2024-11-14 13:48 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-11-14 13:48 [PATCH 0/2] Set reasonable defaults for WKS_FILE value Anton Mikanovich
2024-11-14 13:48 ` [PATCH 1/2] meta: Add missing COREBASE variable Anton Mikanovich
2024-11-14 13:48 ` Anton Mikanovich [this message]
2025-01-17 13:05   ` [PATCH 2/2] wic: Set default WKS_FILE for non efi targets 'Jan Kiszka' via isar-users
2025-01-17 13:45     ` Anton Mikanovich
2024-11-21  6:49 ` [PATCH 0/2] Set reasonable defaults for WKS_FILE value Uladzimir Bely

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241114134829.1466035-3-amikan@ilbers.de \
    --to=amikan@ilbers.de \
    --cc=isar-users@googlegroups.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox