From patchwork Fri Mar 15 13:58:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 3419 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 15 Mar 2024 14:58:30 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f55.google.com (mail-lf1-f55.google.com [209.85.167.55]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 42FDwTig029835 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 15 Mar 2024 14:58:29 +0100 Received: by mail-lf1-f55.google.com with SMTP id 2adb3069b0e04-513c1e823ffsf2911528e87.0 for ; Fri, 15 Mar 2024 06:58:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710511104; cv=pass; d=google.com; s=arc-20160816; b=h+A/9bpmL+mVfGcWTnPGcQQ3Ry0Cgoj4nSRxQRSkfcRTYdN8C/3JdB59UxMhCzmzue YYfh4Sy9oFmi+jl/3cdESYAn2mPXvP3BiprR14aMTu2tyOa/vahddZGkkhAjQOpKzRkt FZq41aRypqDgGvwmQ9CsXCpN9zdp11K72h0MH7Ul2Hvqjr62LcAlKgQ4izs1ZwDmjg5A Iy1UfmlDafvMTDwUk9T1iXrheZ25MR3wk0dKLMRV8ZvsMRMWr9loURznsOExQ7hSF6xa GLdeLJrjsy45RsIJD3YObm0fGS+8xcKwBlEmuK0o+kCgqhAjUF+cVWGJpQfe80Yf4tbz X0CQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=vdO9QfiZmmAZFQ6R1UpAFsvDDYp0RoTFKWEIrRtJSkY=; fh=iX5WjMc/2z5r/jXsVZ/MXQYE8dYYqxaK3yH2I9P3rjQ=; b=aGAr6EiocGJhrAcofAHEsD/lsjsZ0JW51CJmvduyv4gWUKNTnyzFEaXK5w7tdsP1pc K2uucZH1NnJQRuu0e4mxy8U9uSdN9NHSCN4MLTIxEUzkTStncu4vnRAIQU6tZshU72h7 17KEZq2UrjbD1qwPe2/Oq6eEN5mtt10lLYZg0PlWu38DtEXfqWuyukEfbHjQuq4Sx4Ul EZD7ta5kWxganJrgmwaG2b+Tzi092btdOMdsx3tRbR7Zei9Gmd9ie8YhM4WjHcI7ywa1 NyTczyn/08iUllw8SDzBksvhCvQpP7hpx0WQK0Ki35gagyE/dYwnF5emBqpdr0ELhGgt xFJw==; darn=isar-build.org ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1710511104; x=1711115904; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :sender:from:to:cc:subject:date:message-id:reply-to; bh=vdO9QfiZmmAZFQ6R1UpAFsvDDYp0RoTFKWEIrRtJSkY=; b=hI8tSogFhpguhgOte/nMz0KNrXS9tGOfxZGMwsXVVlzwi20FQktpre7LqwDKWWW48O wIWfRUx/vCt0xQMW9v8jbf1A4Zj3Kx3T/J/DVpKD4JqU5m/C8muyPk2WeWhssGiXHygx LmC+HTcfW1LUEsrp20LfAVamWMgwFyy0KRqmGDd6vHxDrZX2wo/OlZnF/BFVO8lfo+xZ YKg47GZfE+xGwOZOC929zpge27XeyQM8ozVu8Wcus4BOBBWfHdpC0m6qKGeQgTo37ofe lC5bFHVLkCkR22nINmBwUvBr0b0A8cRnqLBUY/g00T2qwn3FT4qcSqiUUJ6fPWyD3eP9 JPHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710511104; x=1711115904; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :sender:from:to:cc:subject:date:message-id:reply-to; bh=vdO9QfiZmmAZFQ6R1UpAFsvDDYp0RoTFKWEIrRtJSkY=; b=WXqALco7n5p8PZkAf9/1McTf3tbJ2XgS95sU3pnJIFOOXntp7oQToNGnxQsh/zsGAe 5rSgFgcu5lKfx57mEuOUKml449YH3LaohLyXYv4bsqG//laddJF7LxN7Q+rpABf9CD/c 4jQIBHGsdqKxH++PsRcU5qfqlwS89cM7p3nQrOZvjwqx3prsEvwDpT7kexAdVK5z/o4j q+Q6aUNjCkD3WfAPc3ObuUCymhP/NABmMExuknjFEJKfVRTTsrWbWU0Zs+MZ9tQPZinJ qZoNeXto+Qv0JvN2SWEMuESGy8ts+BmKz+066UWMlpIqI2dPDO9D33Dxp6WI9VmGxkHS 3Xvg== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWuYUEO3mk5F0uvvCgbU3sf+mv77jOQCNF2pLT0LNnAs6KSghOa9vVRdggGEh1GsbhiBHMb2jNpuYr1ilgU+OmUcBgPIs8= X-Gm-Message-State: AOJu0YylexuObrh/SnLk0CRvU00qOrTa/3wGBPWY0ylRFPm8FXcFobLE Y9uxewQBdLRGUkqi3sFMiVRk6wSX9J8ZmgP7ueR7JdszOKTEXj5T X-Google-Smtp-Source: AGHT+IFBSk4CoSp1XfQhdMC0fv+3yel1d/j48MaNC9ix85SbbANSMWMdeWbSaRyoV6DjtminpOzJZA== X-Received: by 2002:a19:5f51:0:b0:513:bc99:677 with SMTP id a17-20020a195f51000000b00513bc990677mr2308599lfj.27.1710511102485; Fri, 15 Mar 2024 06:58:22 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5e73:0:b0:513:b1c4:e1be with SMTP id a19-20020ac25e73000000b00513b1c4e1bels1065033lfr.2.-pod-prod-04-eu; Fri, 15 Mar 2024 06:58:20 -0700 (PDT) X-Received: by 2002:a05:6512:32a3:b0:513:cae8:4409 with SMTP id q3-20020a05651232a300b00513cae84409mr2446474lfe.7.1710511100399; Fri, 15 Mar 2024 06:58:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1710511100; cv=none; d=google.com; s=arc-20160816; b=GzOTgDUK8aHw10uITBFowpPhLu4FQcSeN4HmzZUt+4kjUhsZSRc3iJTpCaqt7oeatR RixHnc9OsgxGMEINq7+9miUjKkDumawfMCtJWnEBaeqCnsiQahyy0CgDUjAubqYmF99p 0ElNs5nNAp5qNSuQxRkbEpmm7YEUN8AbyBb0fQLBJdugkcJOZD+y7v+DF1BMH8GVSNL6 kL7yeOghuGLsljgmN12CUHnHiR4tPcuO5i9viDunIb9GJX1BRLSK1BydBieLRBHehpHp khE7HeGiJHu4/DFW2wQ9qUfIsPGW6zoEWCOC4JJMs1qGiW/fy0xatJCItx3A33G2SVC0 Y+GA== 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=SfIKCYDHMp9y9ljyK8md4RuRbdReov6gamqOoWxY9fs=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=dBmhE7Zkh3w2D5ZEQ1sH/Afqx1vmLenv7maV0r5Bu6XoS/BxtnLIWox2fo45WjNvWL StsKYzm5T2UmkMaC9ejTIoA4i+a71Eq6DX7vhSMlpMyjc7S07OHo2SZ02kduohFZ3fOo kDNh9UNxXRp/+1YJiZn7fzry7K6z2L7fkB19O9TORjCue5dhmSDrbaS2ByJuFiD35y+X zuCyazzVKzYExtf6JoSdpFhngchEDwoi4GqHbgmGaU5K50YWAeFoZgl8pBPC7GOhZO4J y+Y2UV1W8hj/87VhQ7GFsACV9gpjuNx2j7BE5zSZzqsIz+UsAiTkLuI7pA5utkqIBu6z +oag==; 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 Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id g20-20020ac25394000000b00513d22b003bsi198986lfh.11.2024.03.15.06.58.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Mar 2024 06:58:20 -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; 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 42FDwHbF029821 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 15 Mar 2024 14:58:18 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v4] meta: Add Debian Trixie Date: Fri, 15 Mar 2024 15:58:11 +0200 Message-Id: <20240315135811.3906804-1-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS 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-Original-Sender: amikan@ilbers.de X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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 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/debian-trixie.yaml | 7 +++++++ 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 +++++++++++++ 10 files changed, 77 insertions(+), 1 deletion(-) 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/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/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',