diff mbox series

[v3,4/7] add qemuamd64-iso target for hybrid iso9660 image

Message ID 20250124123545.3500274-5-felix.moessbauer@siemens.com
State Accepted, archived
Headers show
Series Add iso9660 image support for ISAR | expand

Commit Message

Felix Moessbauer Jan. 24, 2025, 12:35 p.m. UTC 
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 meta-isar/conf/machine/qemuamd64-iso.conf     | 19 +++++++++++++++++++
 meta-isar/conf/mc.conf                        |  1 +
 .../multiconfig/qemuamd64-iso-bookworm.conf   |  4 ++++
 .../lib/wic/canned-wks/isohybrid-efi.wks.in   |  2 ++
 4 files changed, 26 insertions(+)
 create mode 100644 meta-isar/conf/machine/qemuamd64-iso.conf
 create mode 100644 meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf
 create mode 100644 meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in
diff mbox series

Patch

diff --git a/meta-isar/conf/machine/qemuamd64-iso.conf b/meta-isar/conf/machine/qemuamd64-iso.conf
new file mode 100644
index 00000000..eef5d7ec
--- /dev/null
+++ b/meta-isar/conf/machine/qemuamd64-iso.conf
@@ -0,0 +1,19 @@ 
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens AG
+
+WKS_FILE ?= "isohybrid-efi.wks.in"
+IMAGER_INSTALL:wic += " \
+    ${SYSLINUX_BOOTLOADER_INSTALL} \
+    syslinux-utils \
+    isolinux \
+    xorriso \
+"
+
+IMAGE_PREINSTALL += "live-boot"
+IMAGE_INSTALL:remove = "expand-on-first-boot"
+IMAGE_TYPEDEP:wic += "squashfs"
+SQUASHFS_EXCLUDE_DIRS = "boot"
+
+QEMU_DISK_ARGS ?= "-cdrom ##ROOTFS_IMAGE## -bios /usr/share/ovmf/OVMF.fd"
+
+require conf/machine/qemuamd64.conf
diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf
index 2a7b69f3..7c190b67 100644
--- a/meta-isar/conf/mc.conf
+++ b/meta-isar/conf/mc.conf
@@ -22,6 +22,7 @@  BBMULTICONFIG = " \
     qemuamd64-sb-bullseye \
     qemuamd64-bookworm \
     qemuamd64-cip-bookworm \
+    qemuamd64-iso-bookworm \
     qemuamd64-trixie \
     container-amd64-buster \
     container-amd64-bullseye \
diff --git a/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf b/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf
new file mode 100644
index 00000000..a2597131
--- /dev/null
+++ b/meta-isar/conf/multiconfig/qemuamd64-iso-bookworm.conf
@@ -0,0 +1,4 @@ 
+# This software is a part of ISAR.
+
+MACHINE ?= "qemuamd64-iso"
+DISTRO ?= "debian-bookworm"
diff --git a/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in b/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in
new file mode 100644
index 00000000..514f756c
--- /dev/null
+++ b/meta-isar/scripts/lib/wic/canned-wks/isohybrid-efi.wks.in
@@ -0,0 +1,2 @@ 
+part /boot --source isoimage-isohybrid-isar --sourceparams="loader=grub-efi,payload=${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.squashfs" --ondisk cd --label LIVECD
+bootloader --timeout=10 --append "console=ttyS0,115200 console=tty0 boot=live toram=${IMAGE_FULLNAME}.squashfs"