| Message ID | 05cb4098-8d7b-48a6-9615-1cb667ca55a6@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | meta-isar: Add a x86 PC target | expand |
On Sat, 2024-08-31 at 10:45 +0200, 'Jan Kiszka' via isar-users wrote: > From: Jan Kiszka <jan.kiszka@siemens.com> > > Just flash on a USB stick and boot. Supports both EFI and legacy > booting. > > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> > --- > > Somehow strange that this was missing so far. > > kas/machine/Kconfig | 4 ++++ > kas/machine/x86-pc.yaml | 9 +++++++++ > meta-isar/conf/machine/x86-pc.conf | 15 +++++++++++++++ > meta-isar/conf/mc.conf | 1 + > meta-isar/conf/multiconfig/x86-pc-bookworm.conf | 7 +++++++ > 5 files changed, 36 insertions(+) > create mode 100644 kas/machine/x86-pc.yaml > create mode 100644 meta-isar/conf/machine/x86-pc.conf > create mode 100644 meta-isar/conf/multiconfig/x86-pc-bookworm.conf > > diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig > index 9ea5b50f..d406b85f 100644 > --- a/kas/machine/Kconfig > +++ b/kas/machine/Kconfig > @@ -110,6 +110,9 @@ config MACHINE_VMWARE > bool "vmware" > depends on DEBIAN_BULLSEYE > > +config MACHINE_X86_PC > + bool "x86 PC" > + > endchoice > > config KAS_INCLUDE_MACHINE > @@ -139,5 +142,6 @@ config KAS_INCLUDE_MACHINE > default "kas/machine/stm32mp15x.yaml" if MACHINE_STM32MP15X > default "kas/machine/virtualbox.yaml" if MACHINE_VIRTUALBOX > default "kas/machine/vmware.yaml" if MACHINE_VMWARE > + default "kas/machine/x86-pc.yaml" if MACHINE_X86_PC > > endmenu > diff --git a/kas/machine/x86-pc.yaml b/kas/machine/x86-pc.yaml > new file mode 100644 > index 00000000..f1dfed28 > --- /dev/null > +++ b/kas/machine/x86-pc.yaml > @@ -0,0 +1,9 @@ > +# This software is a part of ISAR. > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +header: > + version: 14 > + > +machine: x86-pc > diff --git a/meta-isar/conf/machine/x86-pc.conf b/meta- > isar/conf/machine/x86-pc.conf > new file mode 100644 > index 00000000..4b2efbe3 > --- /dev/null > +++ b/meta-isar/conf/machine/x86-pc.conf > @@ -0,0 +1,15 @@ > +# > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +DISTRO_ARCH ?= "amd64" > + > +KERNEL_NAME ?= "amd64" > + > +IMAGE_FSTYPES ?= "wic" > +WKS_FILE ?= "efi-plus-pcbios" > + > +IMAGER_INSTALL:wic += " \ > + ${GRUB_BOOTLOADER_INSTALL} \ > + ${SYSLINUX_BOOTLOADER_INSTALL}" > diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf > index 7fd638d3..d8c3a3a7 100644 > --- a/meta-isar/conf/mc.conf > +++ b/meta-isar/conf/mc.conf > @@ -48,6 +48,7 @@ BBMULTICONFIG = " \ > stm32mp15x-bullseye \ > virtualbox-bullseye \ > virtualbox-bookworm \ > + x86-pc-bookworm \ > rpi-arm-bullseye \ > rpi-arm-bookworm \ > rpi-arm-v7-bullseye \ > diff --git a/meta-isar/conf/multiconfig/x86-pc-bookworm.conf b/meta- > isar/conf/multiconfig/x86-pc-bookworm.conf > new file mode 100644 > index 00000000..1fd9d429 > --- /dev/null > +++ b/meta-isar/conf/multiconfig/x86-pc-bookworm.conf > @@ -0,0 +1,7 @@ > +# > +# Copyright (c) Siemens AG, 2024 > +# > +# SPDX-License-Identifier: MIT > + > +MACHINE ?= "x86-pc" > +DISTRO ?= "debian-bookworm" > -- > 2.43.0 > Applied to next, thanks.
diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 9ea5b50f..d406b85f 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -110,6 +110,9 @@ config MACHINE_VMWARE bool "vmware" depends on DEBIAN_BULLSEYE +config MACHINE_X86_PC + bool "x86 PC" + endchoice config KAS_INCLUDE_MACHINE @@ -139,5 +142,6 @@ config KAS_INCLUDE_MACHINE default "kas/machine/stm32mp15x.yaml" if MACHINE_STM32MP15X default "kas/machine/virtualbox.yaml" if MACHINE_VIRTUALBOX default "kas/machine/vmware.yaml" if MACHINE_VMWARE + default "kas/machine/x86-pc.yaml" if MACHINE_X86_PC endmenu diff --git a/kas/machine/x86-pc.yaml b/kas/machine/x86-pc.yaml new file mode 100644 index 00000000..f1dfed28 --- /dev/null +++ b/kas/machine/x86-pc.yaml @@ -0,0 +1,9 @@ +# This software is a part of ISAR. +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +header: + version: 14 + +machine: x86-pc diff --git a/meta-isar/conf/machine/x86-pc.conf b/meta-isar/conf/machine/x86-pc.conf new file mode 100644 index 00000000..4b2efbe3 --- /dev/null +++ b/meta-isar/conf/machine/x86-pc.conf @@ -0,0 +1,15 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +DISTRO_ARCH ?= "amd64" + +KERNEL_NAME ?= "amd64" + +IMAGE_FSTYPES ?= "wic" +WKS_FILE ?= "efi-plus-pcbios" + +IMAGER_INSTALL:wic += " \ + ${GRUB_BOOTLOADER_INSTALL} \ + ${SYSLINUX_BOOTLOADER_INSTALL}" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 7fd638d3..d8c3a3a7 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -48,6 +48,7 @@ BBMULTICONFIG = " \ stm32mp15x-bullseye \ virtualbox-bullseye \ virtualbox-bookworm \ + x86-pc-bookworm \ rpi-arm-bullseye \ rpi-arm-bookworm \ rpi-arm-v7-bullseye \ diff --git a/meta-isar/conf/multiconfig/x86-pc-bookworm.conf b/meta-isar/conf/multiconfig/x86-pc-bookworm.conf new file mode 100644 index 00000000..1fd9d429 --- /dev/null +++ b/meta-isar/conf/multiconfig/x86-pc-bookworm.conf @@ -0,0 +1,7 @@ +# +# Copyright (c) Siemens AG, 2024 +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "x86-pc" +DISTRO ?= "debian-bookworm"