From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7256673355216977920 X-Received: by 2002:a7b:cd09:0:b0:3fb:d1c1:9b79 with SMTP id f9-20020a7bcd09000000b003fbd1c19b79mr8411955wmj.30.1689575928453; Sun, 16 Jul 2023 23:38:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:511b:b0:3fb:422d:5005 with SMTP id o27-20020a05600c511b00b003fb422d5005ls1946220wms.2.-pod-prod-01-eu; Sun, 16 Jul 2023 23:38:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlFlanu/l+5e46V3SD95qZ9Nx/i5s+mXczWq8WuA++T/J5dyeOSssouDpx6iLr6+gJ5bN2BN X-Received: by 2002:a05:600c:3647:b0:3fa:9924:1241 with SMTP id y7-20020a05600c364700b003fa99241241mr9545898wmq.4.1689575926388; Sun, 16 Jul 2023 23:38:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689575926; cv=none; d=google.com; s=arc-20160816; b=Bs223fzLS/H3VOxU9YSioonwMLUTmYzMKFxBCO8MCFG6shTw95MkLBIXIQuMSuMZd4 +mLNqauCKnYEI3drRfV9tQ2PxlVmYHO+MT2DGZGFHvGT53BW40aFvupiXJJ/kZdDwWYH qpQJCWOlIaJ0d9kV8xZGampCqiKVJ8wjtN9j7iKcGHyckXP2tgU9oRDLOarw+eXRTnNL vH7cnKSIU2M6ZB+sRzixTU9PNcbpjiZ1rOO4MNJe85cGFAzKrliLMQosaqKDrU8SVBW7 rtpZXt1xk5y1kyv+VzE3zA6lGCoZoJ3PxzKG66N+qG82aDSVpfc5Jy/1b1j95x61Q2sY G1/w== 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=Jei+2HIE+Kp6TmvYn/zucERC1b+/uGnYHNoYWHfLkBg=; fh=FgGrhZwXL/RxwXGSKgVZF9jur0GIKKvqf1fffygc4qo=; b=qrCdYweZpWcLYUR6+CNgSyy2sSCFw7HmjiJBrkHlao4LvO1xRjyHxh2+zBBb28Jal0 +ptZEVJ4gCiIh/p4PE/9ddKqGUgJZDXEZGCq6TieW+pxf+QXqReZhUUcLAcDl5DnHcfW INiX6YbtwVoyZhTKHD/lkcMyjL37F5dbYxbf5ffbMlgSIYV7cVSWRdAHkj5+Lt4ENOsP Dwt//Hngi9gd2Jwk3rOc1Qyg3sTZFsOKz7g0oKh4ZZEmVjftD8a3VT7UWQkVkX0qu9VU JjULCsVnyvFOq8pdXi3xg40l/GSDJMdTrOpeMbi6pwRJAuLzJm2JDf71iK20PCsEoaTV QYag== 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 fj10-20020a05600c0c8a00b003fb415dd573si427032wmb.2.2023.07.16.23.38.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 16 Jul 2023 23:38:46 -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.com (r154-240-38-77-broadband.btv.lv [77.38.240.154] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 36H6cj4v000367 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 17 Jul 2023 08:38:45 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH] meta: Add Debian Trixie Date: Mon, 17 Jul 2023 09:38:32 +0300 Message-Id: <20230717063832.783378-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: /GAaW5zKwRuM 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/local.conf.sample | 3 +++ .../conf/multiconfig/qemuamd64-trixie.conf | 7 +++++++ meta-isar/conf/multiconfig/qemuarm-trixie.conf | 7 +++++++ .../conf/multiconfig/qemuarm64-trixie.conf | 7 +++++++ meta-test/conf/local.conf.sample | 3 +++ meta/conf/distro/debian-trixie.conf | 17 +++++++++++++++++ meta/conf/distro/debian-trixie.list | 8 ++++++++ testsuite/citest.py | 13 +++++++++++++ 10 files changed, 71 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 118acf52..c427c137 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,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 04cf52bb..fe96cfd5 100644 --- a/doc/user_manual.md +++ b/doc/user_manual.md @@ -60,6 +60,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 \ @@ -431,6 +433,7 @@ In Isar, each machine can use its specific Linux distro to generate `buildchroot - debian-buster - debian-bullseye - debian-bookworm + - debian-trixie (host >= bookworm) - ubuntu-focal - ubuntu-jammy (requires host dpkg >= 1.21) - raspios-bullseye @@ -961,6 +964,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/local.conf.sample b/meta-isar/conf/local.conf.sample index 762709f4..903722bd 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -41,9 +41,11 @@ BBMULTICONFIG = " \ qemuarm-buster \ qemuarm-bullseye \ qemuarm-bookworm \ + qemuarm-trixie \ qemuarm64-buster \ qemuarm64-bullseye \ qemuarm64-bookworm \ + qemuarm64-trixie \ qemui386-buster \ qemui386-bullseye \ qemui386-bookworm \ @@ -51,6 +53,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..bc571c34 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuamd64-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 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..f4a01c69 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 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..c8637a07 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuarm64-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuarm64" +DISTRO ?= "debian-trixie" diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index b705d3a8..955ac640 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -11,9 +11,11 @@ BBMULTICONFIG = " \ qemuarm-buster \ qemuarm-bullseye \ qemuarm-bookworm \ + qemuarm-trixie \ qemuarm64-buster \ qemuarm64-bullseye \ qemuarm64-bookworm \ + qemuarm64-trixie \ qemui386-buster \ qemui386-bullseye \ qemui386-bookworm \ @@ -21,6 +23,7 @@ BBMULTICONFIG = " \ qemuamd64-bullseye \ qemuamd64-sb-bullseye \ qemuamd64-bookworm \ + qemuamd64-trixie \ container-amd64-buster \ container-amd64-bullseye \ container-amd64-bookworm \ diff --git a/meta/conf/distro/debian-trixie.conf b/meta/conf/distro/debian-trixie.conf new file mode 100644 index 00000000..c30f4ca7 --- /dev/null +++ b/meta/conf/distro/debian-trixie.conf @@ -0,0 +1,17 @@ +# This software is a part of ISAR. +# Copyright (C) 2023 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 b81d86f9..34258452 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -253,6 +253,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_sidports(self): targets = [ 'mc:qemuriscv64-sid-ports:isar-image-base', -- 2.34.1