From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327981176329601024 X-Received: by 2002:a05:600c:4ecd:b0:40e:ce97:4452 with SMTP id g13-20020a05600c4ecd00b0040ece974452mr230429wmq.34.1706178573324; Thu, 25 Jan 2024 02:29:33 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a5d:4c82:0:b0:339:48fa:cc09 with SMTP id z2-20020a5d4c82000000b0033948facc09ls970266wrs.2.-pod-prod-01-eu; Thu, 25 Jan 2024 02:29:31 -0800 (PST) X-Google-Smtp-Source: AGHT+IHz99rJyH8wKWWNhXqO+qRs5kOVqhR5tg/Vuw9RGd1iGwFoKrM9ORaPVF9q6gs91WYVLI29 X-Received: by 2002:a05:600c:548d:b0:40e:6087:89b7 with SMTP id iv13-20020a05600c548d00b0040e608789b7mr384364wmb.107.1706178571535; Thu, 25 Jan 2024 02:29:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706178571; cv=none; d=google.com; s=arc-20160816; b=WXtqE1p4+TL2REq8xs8azdpHtAPEQjMsPXFJBuMZyC6KWMw7QhcC0RFDDPpk+WXqt5 vDirBKlWbwsaue6rBWqhZ4JvwOuInmi5qWt6NtZr7DxvWgPiqTI+7V9OLKoVkkCtq19j OUDHMNqoaViGL6C3x4hSmNGC6GTJm4X0ng2eHHFGI3bvYcGjBVCHGnvDqQs+wKsDknEW AMp0VSntVGSIBODsnHGjPCJV2bRlctAYRzEACHTT8tHmvsfpHKqU9XDTzMI38v1MAkHy HFn5bg+Ruvny8pTXjQkoJYJUg/74dMnXiiNe1XgVjRT+5S0Qb2g9/hmCwF/JDPb1jze4 u40g== 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=TFgOqYqn0RY+DdgQP4BlzOTWPAi5MrWoK+TDU0vtHyY=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=d31rE5iuSyHRGyEDayVpvkSFe/cKe9jXMjfmn9vaZ2UPbWSmDQB6oZDxFHezvAK7YI ZvHAjViJZrusQJ6ixgFxeOwDy3DBNriMehVeEH5uygcK2Yu2szx8ubWA38mVlqcoZkQG /gn8YBwTMvgFv5Vge5Wj8FaRK1xPyn3A81owA7cP1t3evs7t/VSw3MhV2B6xYuGGuMzf VO+unJKvfkUXWt6a/Xq25ZYFBnLGmbiFOnFvTGnZhgdUK98HiZCTGs/HSDg7yNPBHW57 9st/o9Tpe7G3WP5HU0A/fFwUZQM0Pc6O2GGkm2eKqqb1h3+XcAVKK/ceAOW7W+vNeNit N1sQ== 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 g19-20020a05600c4ed300b0040ece9a08f2si56554wmq.1.2024.01.25.02.29.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Jan 2024 02:29:31 -0800 (PST) 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 40PATUEU011698 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 25 Jan 2024 11:29:30 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2] meta: Add Debian Trixie Date: Thu, 25 Jan 2024 12:29:15 +0200 Message-Id: <20240125102915.2950913-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: lYpThxvZqdWJ 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 --- README.md | 2 +- doc/user_manual.md | 5 +++++ meta-isar/conf/mc.conf | 3 +++ .../conf/multiconfig/qemuamd64-trixie.conf | 7 +++++++ meta-isar/conf/multiconfig/qemuarm-trixie.conf | 7 +++++++ .../conf/multiconfig/qemuarm64-trixie.conf | 7 +++++++ meta/conf/distro/debian-trixie.conf | 17 +++++++++++++++++ meta/conf/distro/debian-trixie.list | 8 ++++++++ testsuite/citest.py | 13 +++++++++++++ 9 files changed, 68 insertions(+), 1 deletion(-) 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..5c9b2642 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 2eb97647..4181db37 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -62,6 +62,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 \ @@ -439,6 +441,7 @@ following distros: - debian-buster - debian-bullseye - debian-bookworm + - debian-trixie (host >= bookworm) - ubuntu-focal - ubuntu-jammy (requires host dpkg >= 1.21) - raspios-bullseye @@ -971,6 +974,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/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index d16f54b5..6403f689 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..c06520cc --- /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..91d1b137 --- /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..770199c2 --- /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..73b216d0 --- /dev/null +++ b/meta/conf/distro/debian-trixie.conf @@ -0,0 +1,17 @@ +# 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 ?= "4kc-malta 5kc-malta 686-pae 686 amd64 arm64 armmp-lpae \ + armmp cloud-amd64 cloud-arm64 loongson-3 marvell mips32r2el mips64r2el \ + octeon powerpc64le rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp s390x" + +DISTRO_GCC = "12" 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 d7ece76c..98607ac3 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -227,6 +227,19 @@ class NoCrossTest(CIBaseTest): except: self.cancel('KFAIL') + def test_nocross_trixie(self): + targets = [ + 'mc:qemuamd64-trixie:isar-image-ci', + 'mc:qemuarm64-trixie:isar-image-ci', + 'mc:qemuarm-trixie:isar-image-ci', + ] + + 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