[5/5] add kas menu target for qemuamd64-iso machine

Message ID 20250121101252.324899-6-felix.moessbauer@siemens.com
State Superseded, archived
Headers show
Series Add iso9660 image support for ISAR | expand

Commit Message

Felix Moessbauer Jan. 21, 2025, 10:12 a.m. UTC
The iso support has been tested with the following distributions:

- Debian: buster, bullseye, bookworm, trixie
- Ubuntu: Focal, Jammy, Noble

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 kas/machine/Kconfig            | 14 ++++++++++++++
 kas/machine/qemuamd64-iso.yaml |  7 +++++++
 2 files changed, 21 insertions(+)
 create mode 100644 kas/machine/qemuamd64-iso.yaml

Comments

Uladzimir Bely Jan. 22, 2025, 12:25 p.m. UTC | #1
On Tue, 2025-01-21 at 11:12 +0100, 'Felix Moessbauer' via isar-users
wrote:
> The iso support has been tested with the following distributions:
> 
> - Debian: buster, bullseye, bookworm, trixie
> - Ubuntu: Focal, Jammy, Noble
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  kas/machine/Kconfig            | 14 ++++++++++++++
>  kas/machine/qemuamd64-iso.yaml |  7 +++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 kas/machine/qemuamd64-iso.yaml
> 
> diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
> index 1740bd56..c37a1465 100644
> --- a/kas/machine/Kconfig
> +++ b/kas/machine/Kconfig
> @@ -107,6 +107,19 @@ config MACHINE_QEMU_AMD64_SB
>  	select CODENAME_BULLSEYE
>  	select ARCH_AMD64
>  
> +config MACHINE_QEMU_AMD64_ISO
> +	bool "qemuamd64-iso"
> +	select DISTRO_DEBIAN
> +	select CODENAME_BUSTER
> +	select CODENAME_BULLSEYE
> +	select CODENAME_BOOKWORM
> +	select CODENAME_TRIXIE

Since only "qemuamd64-iso-bookworm" multiconfig is added (and tested)
we should leave only DISTRO_DEBIAN and CODENAME_BOOKWORM here. If user
wants to build untested combination, they can check an appropriate
option in "Distro selection" sumenu.

> +	select DISTRO_UBUNTU
> +	select CODENAME_FOCAL
> +	select CODENAME_JAMMY
> +	select CODENAME_NOBLE
> +	select ARCH_AMD64
> +
>  config MACHINE_QEMU_AMD64
>  	bool "qemuamd64"
>  	select DISTRO_DEBIAN
> @@ -252,6 +265,7 @@ config KAS_INCLUDE_MACHINE
>  	default "kas/machine/phyboard-mira.yaml" if
> MACHINE_PHYBOARD_MIRA
>  	default "kas/machine/qemuamd64-cip.yaml" if
> MACHINE_QEMU_AMD64_CIP
>  	default "kas/machine/qemuamd64-sb.yaml" if
> MACHINE_QEMU_AMD64_SB
> +	default "kas/machine/qemuamd64-iso.yaml" if
> MACHINE_QEMU_AMD64_ISO
>  	default "kas/machine/qemuamd64.yaml" if MACHINE_QEMU_AMD64
>  	default "kas/machine/qemuarm.yaml" if MACHINE_QEMU_ARM
>  	default "kas/machine/qemuarm64.yaml" if MACHINE_QEMU_ARM64
> diff --git a/kas/machine/qemuamd64-iso.yaml b/kas/machine/qemuamd64-
> iso.yaml
> new file mode 100644
> index 00000000..f58a1217
> --- /dev/null
> +++ b/kas/machine/qemuamd64-iso.yaml
> @@ -0,0 +1,7 @@
> +# This software is a part of ISAR.
> +# Copyright (C) 2025 Siemens AG
> +
> +header:
> +  version: 14
> +
> +machine: qemuamd64-iso
> -- 
> 2.39.5
>

Patch

diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
index 1740bd56..c37a1465 100644
--- a/kas/machine/Kconfig
+++ b/kas/machine/Kconfig
@@ -107,6 +107,19 @@  config MACHINE_QEMU_AMD64_SB
 	select CODENAME_BULLSEYE
 	select ARCH_AMD64
 
+config MACHINE_QEMU_AMD64_ISO
+	bool "qemuamd64-iso"
+	select DISTRO_DEBIAN
+	select CODENAME_BUSTER
+	select CODENAME_BULLSEYE
+	select CODENAME_BOOKWORM
+	select CODENAME_TRIXIE
+	select DISTRO_UBUNTU
+	select CODENAME_FOCAL
+	select CODENAME_JAMMY
+	select CODENAME_NOBLE
+	select ARCH_AMD64
+
 config MACHINE_QEMU_AMD64
 	bool "qemuamd64"
 	select DISTRO_DEBIAN
@@ -252,6 +265,7 @@  config KAS_INCLUDE_MACHINE
 	default "kas/machine/phyboard-mira.yaml" if MACHINE_PHYBOARD_MIRA
 	default "kas/machine/qemuamd64-cip.yaml" if MACHINE_QEMU_AMD64_CIP
 	default "kas/machine/qemuamd64-sb.yaml" if MACHINE_QEMU_AMD64_SB
+	default "kas/machine/qemuamd64-iso.yaml" if MACHINE_QEMU_AMD64_ISO
 	default "kas/machine/qemuamd64.yaml" if MACHINE_QEMU_AMD64
 	default "kas/machine/qemuarm.yaml" if MACHINE_QEMU_ARM
 	default "kas/machine/qemuarm64.yaml" if MACHINE_QEMU_ARM64
diff --git a/kas/machine/qemuamd64-iso.yaml b/kas/machine/qemuamd64-iso.yaml
new file mode 100644
index 00000000..f58a1217
--- /dev/null
+++ b/kas/machine/qemuamd64-iso.yaml
@@ -0,0 +1,7 @@ 
+# This software is a part of ISAR.
+# Copyright (C) 2025 Siemens AG
+
+header:
+  version: 14
+
+machine: qemuamd64-iso