From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7327981176329601024 X-Received: by 2002:a05:600c:310f:b0:412:f572:5318 with SMTP id g15-20020a05600c310f00b00412f5725318mr4611663wmo.11.1710150844774; Mon, 11 Mar 2024 02:54:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:1c88:b0:412:ed99:9d0 with SMTP id k8-20020a05600c1c8800b00412ed9909d0ls851514wms.2.-pod-prod-08-eu; Mon, 11 Mar 2024 02:54:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpYQcbWO3U0ifRbS7fW7juA8SPdZ8ZulJEtkce/2yTY3csoLVdjDC1Qsd5kmZdzks6fQld X-Received: by 2002:a05:600c:45c9:b0:413:1f65:ec19 with SMTP id s9-20020a05600c45c900b004131f65ec19mr4276521wmo.37.1710150842781; Mon, 11 Mar 2024 02:54:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710150842; cv=none; d=google.com; s=arc-20160816; b=gZ+EV4ELrRa8aK9uYZlYQCMYy1iYWzL91/qzZeFFv1cd2Gep3RWiUPwJi6WL4ynyxj Y6pT/id+W22/3G5NHblIkqnqqiEvr/felxgA18g++Db5EyCPybzL/5q8cqrqST/WGuEu FuJU/vASvyYsgw9pTkIL9kG9sD8FGu3osj4KrVUsHUQ9YhUnH+Ni/BNMc8JTroJplqeV Bkvd9OcYhlL+h96E6O7OApLpTbszX0rEWWjjmxiSN0zTsdY32wp0P7aZAdZn49eakVjR dPUoRCxPiSbbz75tomkykBgwIOd4Fi2+NU5V5gyYAHbUhhCP4X2/84vExu8YgQxambtJ ptyg== 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=Eh4XOcWm8DdA7fqDhC2ukXe96wtYdvVW4a9sbSEAVms=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=0h4PypamQC/6GkdPPuPE+f5HVrcwMszeB+fpUExCYcxyG5dNa4iCjtaFGhklTo6AFC Kayrr3Xys9H8DvZSCkkYUvpPbwKFgYxhJFMVUQovUQVHonuKBD5cjNadtT+RguWzhkBp 80HZOxti4SPSHWZkYc39PVK0laz1/MHNHFFJD7cp6vq9J5Xh0lT7kWrNxDmccGHsFqGd /o4orPJYcaEdi20zQXwl77KWw7/5lTrrkK+GR37T81ShiuzLi72GynsG719RjJeGbeec Shm+smbu/Hpg3uA7ErcfB5+5ae3HNAmbv0UeJiQQ3ODlpmVgGJ0xxnmgBSrtnc44ZPe/ iEqg==; 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 j12-20020a05600c190c00b004131f588dccsi291215wmq.1.2024.03.11.02.54.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Mar 2024 02:54:02 -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 42B9s1vs005366 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 Mar 2024 10:54:01 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v3] meta: Add Debian Trixie Date: Mon, 11 Mar 2024 11:53:54 +0200 Message-Id: <20240311095354.3749444-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: LJ+PFwq0RAhE 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 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 +++++ 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 +++++++++++++ 9 files changed, 70 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 bc730243..61fe1ecb 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 @@ -1003,6 +1006,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 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..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..72c8f740 --- /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