From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327981176329601024 X-Received: by 2002:a19:f017:0:b0:513:b8c0:faa8 with SMTP id p23-20020a19f017000000b00513b8c0faa8mr2133671lfc.65.1710513943915; Fri, 15 Mar 2024 07:45:43 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5014:b0:413:f289:6c21 with SMTP id n20-20020a05600c501400b00413f2896c21ls322842wmr.0.-pod-prod-06-eu; Fri, 15 Mar 2024 07:45:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHHVPoh+aQWKOwJFxfMnIO9nquHtoZBuMbZKgMKHoxnuj8/mAmYalM0LsMVRL5SaL8qmf3D X-Received: by 2002:a05:600c:3c82:b0:412:f81a:48c4 with SMTP id bg2-20020a05600c3c8200b00412f81a48c4mr2479095wmb.13.1710513941431; Fri, 15 Mar 2024 07:45:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710513941; cv=none; d=google.com; s=arc-20160816; b=I6gt2fSIsDZolS5IcvIccJ0JyHywTzInmbKIDVCwqFeM3w0vtd36Fu39QMnfkq9TUr vY5Wn3/sgHXFJ4EGWUauU3pMBgw/M4TBKFstfirOvPwcszfOdwY4IWIv3RtmluTjMi95 lew76eCSB4OfR7ZZo/EycUYY2ceMEmq1l/D5LTisJ4yPl/sdgpqEsEbd8VW/0xHh+tMr /I9pYjL2ltdyyTu3ExnLqOHrL5RH2IgZqs2peADvZK7Y+Mg3IK7MVieLR3o2r0K7c6Dy ebXuL7fKZLzPD/kpn6x7H0at4qvMpAXcBwhBztREX4xjMOQ+kM3JUzIVS5F8NR67wQHL geiw== 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:cc :to:from; bh=tUNE+C1iLfcdQdIXkkXejnJylXXRyuYXMIFWsEJ1XwA=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=Qj3I4LG8VlcCUbSaVnUfwx55gP+yLtK6fd4LNtXJ252GvMiol3vaxzcTaYd396vjg2 ChNUo14O6KfnuppoDv/gLEDz03+puZhpa78VU69ws+jBx9F0k2Z7DZ/jUl3M7d6zWU4k YececSHfYtjVjZ8lzUnMAsNWOop4p1eC/fe4mchRFVjc/lg28OvcRUxblS0HxHwiQjqJ Pg8F3OWL/aNKISvg9cdPk7Gux4PFNNcbTw7hecge1fIgHvZZ1pFEUPQZICjbVsqsagk6 7KmtxYX/7LIyYS/vHEazHQW2UQyn6T8CEQjXlr38+rYC3k7poonCiOFVLlz5e02eQNn4 A/eQ==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id f7-20020a7bcd07000000b00414024b3027si66572wmj.0.2024.03.15.07.45.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Mar 2024 07:45:41 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 42FEjeqP030039 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Mar 2024 15:45:40 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v5] meta: Add Debian Trixie Date: Fri, 15 Mar 2024 16:45:33 +0200 Message-Id: <20240315144533.3910381-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.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: xksoaAEAW/4c Add the next testing target in Isar and CI. Also update documentation with the new distro name. Building debian-trixie requires host >= bookworm. Signed-off-by: Anton Mikanovich --- Changes since v4: - Fix kas configs for trixie Changes since v3: - Add kas config - Fix some wording Changes since v2: - Rebase on next - Update kernel list - Fix DISTRO_GCC value - Add DEBIAN_COMPAT value - Use base image in CI README.md | 2 +- doc/user_manual.md | 5 +++++ kas/distro/Kconfig | 4 ++++ kas/distro/debian-trixie.yaml | 7 +++++++ kas/machine/Kconfig | 6 +++--- meta-isar/conf/mc.conf | 3 +++ .../conf/multiconfig/qemuamd64-trixie.conf | 7 +++++++ .../conf/multiconfig/qemuarm-trixie.conf | 7 +++++++ .../conf/multiconfig/qemuarm64-trixie.conf | 7 +++++++ meta/conf/distro/debian-trixie.conf | 19 +++++++++++++++++++ meta/conf/distro/debian-trixie.list | 8 ++++++++ testsuite/citest.py | 13 +++++++++++++ 12 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 kas/distro/debian-trixie.yaml create mode 100644 meta-isar/conf/multiconfig/qemuamd64-trixie.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm-trixie.conf create mode 100644 meta-isar/conf/multiconfig/qemuarm64-trixie.conf create mode 100644 meta/conf/distro/debian-trixie.conf create mode 100644 meta/conf/distro/debian-trixie.list diff --git a/README.md b/README.md index f549aa9f..b53cd094 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ To test the QEMU image, run the following command: $ start_vm -a -d Ex: Architecture of your build could be arm,arm64,i386,amd64,etc. - Distribution of your build could be buster,bullseye,bookworm,etc. + Distribution of your build could be buster, bullseye, bookworm, trixie, etc. The default root password is 'root'. diff --git a/doc/user_manual.md b/doc/user_manual.md index 52f04aa1..419d5339 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -68,6 +68,8 @@ The steps below describe how to build the images provided by default. The supported host system is >= buster. +Building `debian-trixie` requires host system >= bookworm. + Install the following packages: ``` apt install \ @@ -445,6 +447,7 @@ following distros: - debian-buster - debian-bullseye - debian-bookworm + - debian-trixie (host >= bookworm) - ubuntu-focal - ubuntu-jammy (requires host dpkg >= 1.21) - raspios-bullseye @@ -1011,6 +1014,8 @@ Debian cross-compilation works out of the box. Currently the following build con - bookworm armhf - bookworm arm64 - bookworm mipsel + - trixie armhf + - trixie arm64 Experimental support for riscv64 is available as well. diff --git a/kas/distro/Kconfig b/kas/distro/Kconfig index aabf11c4..28898621 100644 --- a/kas/distro/Kconfig +++ b/kas/distro/Kconfig @@ -19,6 +19,9 @@ config DEBIAN_BULLSEYE config DEBIAN_BOOKWORM bool "Debian 12 (bookworm)" +config DEBIAN_TRIXIE + bool "Debian 13 (trixie)" + config DEBIAN_SID bool "Debian Sid (unstable)" @@ -41,6 +44,7 @@ config KAS_INCLUDE_DISTRO default "kas/distro/debian-buster.yaml" if DEBIAN_BUSTER default "kas/distro/debian-bullseye.yaml" if DEBIAN_BULLSEYE default "kas/distro/debian-bookworm.yaml" if DEBIAN_BOOKWORM + default "kas/distro/debian-trixie.yaml" if DEBIAN_TRIXIE 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 diff --git a/kas/distro/debian-trixie.yaml b/kas/distro/debian-trixie.yaml new file mode 100644 index 00000000..7320b2c7 --- /dev/null +++ b/kas/distro/debian-trixie.yaml @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH + +header: + version: 14 + +distro: debian-trixie diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 40c00696..36325981 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -48,15 +48,15 @@ config MACHINE_QEMU_AMD64_SB config MACHINE_QEMU_AMD64 bool "qemuamd64" - depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || UBUNTU_FOCAL || UBUNTU_JAMMY + depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_FOCAL || UBUNTU_JAMMY config MACHINE_QEMU_ARM bool "qemuarm" - depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM + depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE config MACHINE_QEMU_ARM64 bool "qemuarm64" - depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || UBUNTU_FOCAL || UBUNTU_JAMMY + depends on DEBIAN_BUSTER || DEBIAN_BULLSEYE || DEBIAN_BOOKWORM || DEBIAN_TRIXIE || UBUNTU_FOCAL || UBUNTU_JAMMY config MACHINE_QEMU_I386 bool "qemui386" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index fde00a71..0143e768 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -9,9 +9,11 @@ BBMULTICONFIG = " \ qemuarm-buster \ qemuarm-bullseye \ qemuarm-bookworm \ + qemuarm-trixie \ qemuarm64-buster \ qemuarm64-bullseye \ qemuarm64-bookworm \ + qemuarm64-trixie \ qemui386-buster \ qemui386-bullseye \ qemui386-bookworm \ @@ -19,6 +21,7 @@ BBMULTICONFIG = " \ qemuamd64-bullseye \ qemuamd64-sb-bullseye \ qemuamd64-bookworm \ + qemuamd64-trixie \ container-amd64-buster \ container-amd64-bullseye \ container-amd64-bookworm \ diff --git a/meta-isar/conf/multiconfig/qemuamd64-trixie.conf b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf new file mode 100644 index 00000000..09368deb --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuamd64" +DISTRO ?= "debian-trixie" diff --git a/meta-isar/conf/multiconfig/qemuarm-trixie.conf b/meta-isar/conf/multiconfig/qemuarm-trixie.conf new file mode 100644 index 00000000..5600ab23 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm" +DISTRO ?= "debian-trixie" diff --git a/meta-isar/conf/multiconfig/qemuarm64-trixie.conf b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf new file mode 100644 index 00000000..ec61f5ee --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "debian-trixie" diff --git a/meta/conf/distro/debian-trixie.conf b/meta/conf/distro/debian-trixie.conf new file mode 100644 index 00000000..f265b233 --- /dev/null +++ b/meta/conf/distro/debian-trixie.conf @@ -0,0 +1,19 @@ +# This software is a part of Isar. +# Copyright (C) 2024 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +require debian-common.conf + +BASE_DISTRO_CODENAME = "trixie" + +HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}" + +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" +DISTRO_KERNELS ?= "5kc-malta 686 686-pae amd64 arm64 armmp armmp-lpae \ + cloud-amd64 cloud-arm64 loongson-3 mips64r2el octeon powerpc64le rpi \ + rt-686-pae rt-amd64 rt-arm64 rt-armmp s390x" + +DISTRO_GCC = "13" + +DEBIAN_COMPAT = "13" diff --git a/meta/conf/distro/debian-trixie.list b/meta/conf/distro/debian-trixie.list new file mode 100644 index 00000000..4f5f665d --- /dev/null +++ b/meta/conf/distro/debian-trixie.list @@ -0,0 +1,8 @@ +deb http://deb.debian.org/debian trixie main contrib non-free-firmware non-free +deb-src http://deb.debian.org/debian trixie main contrib non-free-firmware non-free + +deb http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free +deb-src http://deb.debian.org/debian-security/ trixie-security main contrib non-free-firmware non-free + +deb http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free +deb-src http://deb.debian.org/debian trixie-updates main contrib non-free-firmware non-free diff --git a/testsuite/citest.py b/testsuite/citest.py index 607a0b20..be9c7cd4 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -231,6 +231,19 @@ class NoCrossTest(CIBaseTest): except: self.cancel('KFAIL') + def test_nocross_trixie(self): + targets = [ + 'mc:qemuamd64-trixie:isar-image-base', + 'mc:qemuarm64-trixie:isar-image-base', + 'mc:qemuarm-trixie:isar-image-base', + ] + + self.init() + try: + self.perform_build_test(targets, cross=False) + except: + self.cancel('KFAIL') + def test_nocross_sid(self): targets = [ 'mc:qemuriscv64-sid:isar-image-base', -- 2.34.1