* [PATCH] kas: Add new configurations and remove non-existent ones
@ 2024-02-23 15:06 Uladzimir Bely
2024-02-29 13:16 ` Uladzimir Bely
0 siblings, 1 reply; 2+ messages in thread
From: Uladzimir Bely @ 2024-02-23 15:06 UTC (permalink / raw)
To: isar-users
From: Ilia Skochilov <iskochilov@ilbers.de>
Add new configurations: virtualbox-bookworm, rpi-arm-v7-bookworm,
rpi-arm-v7l-bookworm, rpi-arm-bookworm, rpi-arm64-v8-bookworm.
Remove non-existent configurations: imx6-sabrelite-bookworm,
phyboard-mira-bookworm, stm32mp15x-bookworm.
Signed-off-by: Ilia Skochilov <iskochilov@ilbers.de>
---
Kas menu configuration aligned with currently supported multiconfigs.
Also, changed names for Debian/Ubuntu items to fit official naming.
kas/distro/Kconfig | 20 ++++++++++++--------
kas/distro/raspios-bookworm.yaml | 7 +++++++
kas/machine/Kconfig | 22 +++++++++++-----------
3 files changed, 30 insertions(+), 19 deletions(-)
create mode 100644 kas/distro/raspios-bookworm.yaml
diff --git a/kas/distro/Kconfig b/kas/distro/Kconfig
index 5118dff4..aabf11c4 100644
--- a/kas/distro/Kconfig
+++ b/kas/distro/Kconfig
@@ -1,5 +1,5 @@
-# This software is a part of ISAR.
-# Copyright (C) 2023 ilbers GmbH
+# This software is a part of Isar.
+# Copyright (C) 2023-2024 ilbers GmbH
#
# Authors:
# Uladzimir Bely <ubely@ilbers.de>
@@ -11,25 +11,28 @@ choice
default DEBIAN_BOOKWORM
config DEBIAN_BUSTER
- bool "Debian Buster (10)"
+ bool "Debian 10 (buster)"
config DEBIAN_BULLSEYE
- bool "Debian Bullseye (11)"
+ bool "Debian 11 (bullseye)"
config DEBIAN_BOOKWORM
- bool "Debian Bookworm (12)"
+ bool "Debian 12 (bookworm)"
config DEBIAN_SID
bool "Debian Sid (unstable)"
config RASPIOS_BULLSEYE
- bool "Raspi OS Bullseye (11)"
+ bool "Raspberry Pi OS Debian 11 (bullseye)"
+
+config RASPIOS_BOOKWORM
+ bool "Raspberry Pi OS Debian 12 (bookworm)"
config UBUNTU_FOCAL
- bool "Ubuntu Focal (20.04)"
+ bool "Ubuntu 20.04 (Focal)"
config UBUNTU_JAMMY
- bool "Ubuntu Jammy (22.04)"
+ bool "Ubuntu 22.04 (Jammy)"
endchoice
@@ -40,6 +43,7 @@ config KAS_INCLUDE_DISTRO
default "kas/distro/debian-bookworm.yaml" if DEBIAN_BOOKWORM
default "kas/distro/debian-sid.yaml" if DEBIAN_SID
default "kas/distro/raspios-bullseye.yaml" if RASPIOS_BULLSEYE
+ default "kas/distro/raspios-bookworm.yaml" if RASPIOS_BOOKWORM
default "kas/distro/ubuntu-focal.yaml" if UBUNTU_FOCAL
default "kas/distro/ubuntu-jammy.yaml" if UBUNTU_JAMMY
diff --git a/kas/distro/raspios-bookworm.yaml b/kas/distro/raspios-bookworm.yaml
new file mode 100644
index 00000000..12e6fc15
--- /dev/null
+++ b/kas/distro/raspios-bookworm.yaml
@@ -0,0 +1,7 @@
+# This software is a part of Isar.
+# Copyright (C) 2024 ilbers GmbH
+
+header:
+ version: 14
+
+distro: raspios-bookworm
diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig
index d0e3963a..40c00696 100644
--- a/kas/machine/Kconfig
+++ b/kas/machine/Kconfig
@@ -1,5 +1,5 @@
-# This software is a part of ISAR.
-# Copyright (C) 2023 ilbers GmbH
+# This software is a part of Isar.
+# Copyright (C) 2023-2024 ilbers GmbH
#
# Authors:
# Uladzimir Bely <ubely@ilbers.de>
@@ -28,7 +28,7 @@ config MACHINE_HIKEY
config MACHINE_IMX6_SABRELITE
bool "imx6-sabrelite"
- depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+ depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE
config MACHINE_NANOPI_NEO
bool "nanopi-neo"
@@ -38,9 +38,9 @@ config MACHINE_NANOPI_NEO_EFI
bool "nanopi-neo-efi"
depends on DEBIAN_BOOKWORM
-config MACHINE_PHIBOARD_MIRA
+config MACHINE_PHYBOARD_MIRA
bool "phyboard-mira"
- depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+ depends on DEBIAN_BULLSEYE
config MACHINE_QEMU_AMD64_SB
bool "qemuamd64-sb"
@@ -72,19 +72,19 @@ config MACHINE_QEMU_RISCV64
config MACHINE_RPI_ARM_V7
bool "rpi-arm-v7"
- depends on RASPIOS_BULLSEYE
+ depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
config MACHINE_RPI_ARM_V7L
bool "rpi-arm-v7l"
- depends on RASPIOS_BULLSEYE
+ depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
config MACHINE_RPI_ARM
bool "rpi-arm"
- depends on RASPIOS_BULLSEYE
+ depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
config MACHINE_RPI_ARM64_V8
bool "rpi-arm64-v8"
- depends on RASPIOS_BULLSEYE
+ depends on RASPIOS_BULLSEYE || RASPIOS_BOOKWORM
config MACHINE_SIFIVE_FU540
bool "sifive-fu540"
@@ -96,11 +96,11 @@ config MACHINE_STARFIVE_VISIONFIVE2
config MACHINE_STM32MP15X
bool "stm32mp15x"
- depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
+ depends on DEBIAN_BULLSEYE
config MACHINE_VIRTUALBOX
bool "virtualbox"
- depends on DEBIAN_BULLSEYE
+ depends on DEBIAN_BULLSEYE || DEBIAN_BOOKWORM
config MACHINE_VMWARE
bool "vmware"
--
2.20.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] kas: Add new configurations and remove non-existent ones
2024-02-23 15:06 [PATCH] kas: Add new configurations and remove non-existent ones Uladzimir Bely
@ 2024-02-29 13:16 ` Uladzimir Bely
0 siblings, 0 replies; 2+ messages in thread
From: Uladzimir Bely @ 2024-02-29 13:16 UTC (permalink / raw)
To: isar-users
On Fri, 2024-02-23 at 16:06 +0100, Uladzimir Bely wrote:
> From: Ilia Skochilov <iskochilov@ilbers.de>
>
> Add new configurations: virtualbox-bookworm, rpi-arm-v7-bookworm,
> rpi-arm-v7l-bookworm, rpi-arm-bookworm, rpi-arm64-v8-bookworm.
> Remove non-existent configurations: imx6-sabrelite-bookworm,
> phyboard-mira-bookworm, stm32mp15x-bookworm.
>
> Signed-off-by: Ilia Skochilov <iskochilov@ilbers.de>
> ---
>
> Kas menu configuration aligned with currently supported multiconfigs.
>
> Also, changed names for Debian/Ubuntu items to fit official naming.
Applied to next.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-02-29 13:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-23 15:06 [PATCH] kas: Add new configurations and remove non-existent ones Uladzimir Bely
2024-02-29 13:16 ` Uladzimir Bely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox