From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7338814155990761472 X-Received: by 2002:a05:6000:24a:b0:33d:9eef:4f25 with SMTP id m10-20020a056000024a00b0033d9eef4f25mr26209wrz.51.1708700823126; Fri, 23 Feb 2024 07:07:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:59a9:0:b0:33d:ab:da4a with SMTP id p9-20020a5d59a9000000b0033d00abda4als450589wrr.0.-pod-prod-08-eu; Fri, 23 Feb 2024 07:07:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IF332C2nCMX1QgUCnVg16GzAIq8lXQrnZ/wozyNSu2GOujWAn5fwBwk9MwSgaL/4yfgP1UO X-Received: by 2002:a5d:490b:0:b0:33d:5548:435e with SMTP id x11-20020a5d490b000000b0033d5548435emr25023wrq.53.1708700820850; Fri, 23 Feb 2024 07:07:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708700820; cv=none; d=google.com; s=arc-20160816; b=dAAyg/WuoSQxZ763C3tyQTCeTDCUcQAeSWhbR4FRCYadsvT73Ft80ey1kVyw4HtBoZ RpwD9dOZ3fmiDx80aJxdV1oEXhZ5x70xr+lH8aZQkyNJ96oflw1utd1eo8NHKhYG7GEZ HZ9Fe1mhq2FnZ0XyCRms/UAKv4QbYyptiXwkvgizsJm+YzpKquCzPRWkwQfb6etH/MMv CfAX6ji2o3LaaG+MmZqlRab7Se8wScrWt8vlg2C7uyvJOswJNpUtPAYhtd76KcxO4rCv FrdRpA1YuCT5MFeoqMzsqoXpXjuS08f8aJj3CmoU8QsqsM1kBQMOGCos/bYc82+7LTTA kOrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=OUO5LLUALShf+7g4qP+Kk/jbtDPF2nGo9FKTKkyZ0aA=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=ndwv8xW/4RBbfrfMagqvbXFGuYv7ROf0jWhiC7jLTuxwi2ooWJ5749pxCrS33w485i +EHL+EDmhF1wtBugX0nlARPAKSb+yLGdWHoDitDxb88LfeMfiwZb9FK0AxjJBiRwPfQo zU7OEUUBAAGS+6tF4SrUxJeA0m140EX/Cf2E+D4vnu3tFiYgKabz3MK4st0N94pLXaPY UvBY0mmM3f2/hNlXVbzNBtJk/lsyH6S0eHWqLYxNGPiM5JOzcV3bW0KOrlHEcVV8lwv3 1KBHuwmAsCJX+aHQWFv/imBRb4oubyMjz+Ch58/3W+F1Hw3Ax9Hyc8jKNfEIYeg0OhVX Yzzw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id m19-20020a056000025300b0033d67b701c9si71250wrz.8.2024.02.23.07.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2024 07:07:00 -0800 (PST) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from azat.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 41NF6xIh002490 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 Feb 2024 16:07:00 +0100 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] kas: Add new configurations and remove non-existent ones Date: Fri, 23 Feb 2024 16:06:59 +0100 Message-Id: <20240223150659.2204-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-TUID: UAwJyqnE9/t8 From: Ilia Skochilov 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 --- 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 @@ -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 @@ -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