| Message ID | 20250123095223.2928575-5-felix.moessbauer@siemens.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | Add iso9660 image support for ISAR | expand |
On Thu, 2025-01-23 at 10:52 +0100, 'Felix Moessbauer' via isar-users wrote: > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > meta-isar/conf/machine/qemuamd64-iso.conf | 29 > +++++++++++++++++++ > meta-isar/conf/mc.conf | 1 + > .../multiconfig/qemuamd64-iso-bookworm.conf | 4 +++ > .../lib/wic/canned-wks/isohybrid-efi.wks.in | 2 ++ > 4 files changed, 36 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 --git a/meta-isar/conf/machine/qemuamd64-iso.conf b/meta- > isar/conf/machine/qemuamd64-iso.conf > new file mode 100644 > index 00000000..36cbdf54 > --- /dev/null > +++ b/meta-isar/conf/machine/qemuamd64-iso.conf > @@ -0,0 +1,29 @@ > +# This software is a part of ISAR. > +# Copyright (C) 2025 Siemens AG > + > +DISTRO_ARCH ?= "amd64" > + > +KERNEL_NAME ?= "amd64" > + > +IMAGE_FSTYPES ?= "wic" > +WKS_FILE ?= "isohybrid-efi.wks.in" > +IMAGER_INSTALL:wic += " \ > + ${GRUB_BOOTLOADER_INSTALL} \ > + ${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_ARCH ?= "x86_64" > +QEMU_MACHINE ?= "q35" > +QEMU_CPU ?= "" > +QEMU_DISK_ARGS ?= "-cdrom ##ROOTFS_IMAGE## -bios > /usr/share/ovmf/OVMF.fd" > + > +MACHINE_SERIAL ?= "ttyS0" > +BAUDRATE_TTY ?= "115200" Forgot to comment in on PATCH v1 series... Would not it be better to include qemuamd64.conf and just add "-iso" related modification, like it's done for other "qemuamd64-xxx" configs? > 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" > -- > 2.39.5 >
diff --git a/meta-isar/conf/machine/qemuamd64-iso.conf b/meta-isar/conf/machine/qemuamd64-iso.conf new file mode 100644 index 00000000..36cbdf54 --- /dev/null +++ b/meta-isar/conf/machine/qemuamd64-iso.conf @@ -0,0 +1,29 @@ +# This software is a part of ISAR. +# Copyright (C) 2025 Siemens AG + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_FSTYPES ?= "wic" +WKS_FILE ?= "isohybrid-efi.wks.in" +IMAGER_INSTALL:wic += " \ + ${GRUB_BOOTLOADER_INSTALL} \ + ${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_ARCH ?= "x86_64" +QEMU_MACHINE ?= "q35" +QEMU_CPU ?= "" +QEMU_DISK_ARGS ?= "-cdrom ##ROOTFS_IMAGE## -bios /usr/share/ovmf/OVMF.fd" + +MACHINE_SERIAL ?= "ttyS0" +BAUDRATE_TTY ?= "115200" 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"
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- meta-isar/conf/machine/qemuamd64-iso.conf | 29 +++++++++++++++++++ meta-isar/conf/mc.conf | 1 + .../multiconfig/qemuamd64-iso-bookworm.conf | 4 +++ .../lib/wic/canned-wks/isohybrid-efi.wks.in | 2 ++ 4 files changed, 36 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