From patchwork Thu Apr 10 10:50:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Mikanovich X-Patchwork-Id: 4152 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 10 Apr 2025 12:50:48 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-il1-f188.google.com (mail-il1-f188.google.com [209.85.166.188]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53AAokh4010970 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 10 Apr 2025 12:50:47 +0200 Received: by mail-il1-f188.google.com with SMTP id e9e14a558f8ab-3d43541a706sf6194035ab.1 for ; Thu, 10 Apr 2025 03:50:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744282241; cv=pass; d=google.com; s=arc-20240605; b=kiuDwMIg88AQQlDBgCkCe2BBnyX6BV4yhTCtnSWG12L6LiYQWNvXnfc8soBISDnHz7 C2EGmW2mA/zEvO32sGScRJOg/4iawop9XyC9YDuK60J1t/qimh3BY4o79AdvQjFe93Zm Z01mY7XYxBEw/90P1qGBIDSj7Y/tkDdCgvVLK34cjs4NP9PEPbDV7cG6JNil4vOb5b2I bMkfFjOhLmYzkp83oXO1rB9mNN3oPLJOGqCqTNV20fG2H1XsoG9KQGY1PmhMtD86sqY4 WTtF3lPYVKE4VtXCqv5g3sKO4ZhPp5oXkC5XUgdzikoMkzz9fqKn8shJKYM7m66ujLmd 4NiQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=OnKOkrqTrFADx2mb81H1HYTuqjLuFkAhU77eVgvaOMw=; fh=A3UGFvg8DlgvD/C1p6Wab5yJPZ54UrLFW4NaTKdAtog=; b=JcTdrDHt1tLPsuUl58iSBpjVuvYomhYCHKS6zRvGxN0y1jpTO+2vOVzxgEc2SDffUo sB1pMCNnR7kNp+GVyOrz18qmMf/pDM3Uo+uaspce9gv8BM8C4S9/lvGmu+HjBxinhVq2 4Z1Xq1N9BUZbCMNPzIfkrkPtwQ9spH50/jmE4hOqY6tHJ10jnt4kWLQ9Fk3uFjixuUbd aACOihFhB7ZQrDPIIOIZajmaysNF9rQ5fgTvG9YZm/3vBr+3wYtbySazuwEbGF1pNBCv q8K+M7vTTf9LiTGHSqMu3wt8eJDi060NpPKbGYmrFawnBVdLf8OOx0GYzePDtsEfkWAz kfqw==; 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=1744282241; x=1744887041; 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:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=OnKOkrqTrFADx2mb81H1HYTuqjLuFkAhU77eVgvaOMw=; b=YDJ1m4NgQLIBM9virhehUHK+eXRcNcZHtHdthpeEMmIBnMeg+swxIdhrzMnWgIQ1TG nZsTtWjuQSrWlm0noI4EF73ElJBe2A1+QdV+kUNMnH+k7bVCW92MHRONBz6o+3kJHMH5 gma+RWZQ+cG3kQETy+cM0ArzUItuuGYRg1da+nq+O0LBdzntGRfEMG5YMZLXCPflgMyq vW0GBNcP4/BqO61tP5gSiNs3MnK04NbetW9nCB/YvgrhGVkLHJYmwc6vCeeq8VjRfPln SV73S6II4vYyhTbAZuymYQCX3Mp5C8u4kfIwsrBNGDY5BC+udd1QCadNq5muQYlg15qP jnEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744282241; x=1744887041; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=OnKOkrqTrFADx2mb81H1HYTuqjLuFkAhU77eVgvaOMw=; b=FmQcNqeZPiXfDM3Q37v4qZyvFICCvyZ1xEcxR97d4vNtqfpPc8hbeT69ZC/X/PuiDt vJZLHwcJdscZ8F87QZhkoOWxRrU8dTfCf4bgSBiWCvMZ7UtIXcz9IXgKqJeNcMFCXRoF dd396gFJtOmuTbzprPZbxFewWCmPe4wd10p8dpqoZMKVuh68NtLUV5F0ZgaLM4ESJQBM lL6Jfwo+KAeDyDiVBdkZ9XFeqfDIAMB8/Ve1RvH84uid1ych50gH/zwIzGWzPNQNtYgy tdVtm5oT4R7hUvaqQ/sjdXzBBuzOXDy5IKs9PkQMsWvXHWpjcakOQ7eznID3Weofxm+b YmBA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXBtQUYzxosqjyUqu1PqI1KggC/taPXUkGFSQQrjk2qYoLFeLwCZViQfkNZIa427VQEaeW0dAQ=@isar-build.org X-Gm-Message-State: AOJu0YxcXfi4hYyr6tomzV1hHlJ9w7fwlJigfknrFKllwSndslzCBs8j n4hsAs65frharRdtuUOjuves8N4b1xD2W0J3YflO7WwQwY3bQGvP X-Google-Smtp-Source: AGHT+IFmsHb0jfjHauJvlZGfmRjGLim4QxHTgUjnQ7F3vFoxOIiJpl9KuegxmBtR98zx9TV+xGaAJQ== X-Received: by 2002:a05:6e02:b2c:b0:3d5:8922:77a0 with SMTP id e9e14a558f8ab-3d7e5fb1a26mr16061625ab.18.1744282241002; Thu, 10 Apr 2025 03:50:41 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJxz24+oJTC3XkPnKMinydCbYBcJOJ/iBQk3SJXqciM1Q== Received: by 2002:a05:6e02:1522:b0:3d4:4545:9ce2 with SMTP id e9e14a558f8ab-3d7e3d2b45dls5460565ab.2.-pod-prod-09-us; Thu, 10 Apr 2025 03:50:39 -0700 (PDT) X-Received: by 2002:a92:c26a:0:b0:3d3:dd32:73d5 with SMTP id e9e14a558f8ab-3d7e5f3d1b5mr16207935ab.4.1744282239419; Thu, 10 Apr 2025 03:50:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744282239; cv=none; d=google.com; s=arc-20240605; b=elGTqh8vvpqDdtbKJQVkGEM6/d9BdcNOIi2kbDz99D02yViYz/Mdy0j3OWitEGA0bq x9Bpz4RbQnVuWnW2zbvpE1IBelDVQMNj2j9OnxC477i2ZXoHkZB6E4mDvQyLOLz8HEZk CmDbMTYe/X5Wvnzkfzf0R/COH4izq8jvUt6sgWhGKile4l95uDrPhhdzEKY0KY8zyobH Ym72eTocT5dGSIPGnSxMCrbJ5n02s0Be5XfFR9OR9kXWCVg+u+k5QzUyIoVZLvco+yb3 KKwXOHd3tZ+ksW2x98g9M/RjYeiHc4KJavxa6Hg7kT3QutyFjvqbJACbNoDBoHM53COu Qr1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=blrGapm2Qzwx+HWTnQrb4phzYNTrBiPkfajXpcNuME4=; fh=CwCU2rLWw4EY7I15ptLF0XIts//b60mXNlmtLyUV/9o=; b=jY14haN8/c+ZMK24U3zJsUmc9zIEGOGmEbqra2dqyNzilnIVLu6+DVmV2S/eRpUPh4 ad9vTm3LjkVFoQ9cbrSnYzWarp1FhAuSV3sGwNnF7siEbKMP+0vnhTPX8enk1fxQa4Fg BS4U3P6Wpm0i5xTiv8BzEYy0RNkJ+RJaXip493LUNj5w+YtioqNWVWiwixjGAc2Lz4cq QYxdTrUUr2BJAZGAi1keQFLGoMYnxZkuU+kuc7SVRbXgRNC0GhEa1B543pIIp363Ztuw Sbc+dPjjuhNe7TzbetuPeZ3iICTH/sz0zAXyxl1KU6vDVODrihr0FDdJ1Hw7t7+EK1Er /RcQ==; 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 8926c6da1cb9f-4f505cf6f46si43662173.2.2025.04.10.03.50.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 03:50:39 -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 localhost.localdomain ([77.38.240.154]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 53AAoZpF010901 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Apr 2025 12:50:37 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Maria Selvam Subject: [PATCH 3/8] Migrate riscv64 targets to Trixie Date: Thu, 10 Apr 2025 13:50:20 +0300 Message-Id: <20250410105025.47019-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250410105025.47019-1-amikan@ilbers.de> References: <20250410105025.47019-1-amikan@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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?= From: Maria Selvam Migrate multiconfig targets from Sid to Trixie and cover them with CI. Signed-off-by: Maria Selvam --- meta-isar/conf/mc.conf | 6 +++--- ...uriscv64-sid.conf => qemuriscv64-trixie.conf} | 4 ++-- meta-isar/conf/multiconfig/sifive-fu540-sid.conf | 7 ------- .../conf/multiconfig/sifive-fu540-trixie.conf | 7 +++++++ .../multiconfig/starfive-visionfive2-sid.conf | 7 ------- .../multiconfig/starfive-visionfive2-trixie.conf | 7 +++++++ testsuite/citest.py | 16 +++------------- 7 files changed, 22 insertions(+), 32 deletions(-) rename meta-isar/conf/multiconfig/{qemuriscv64-sid.conf => qemuriscv64-trixie.conf} (67%) delete mode 100644 meta-isar/conf/multiconfig/sifive-fu540-sid.conf create mode 100644 meta-isar/conf/multiconfig/sifive-fu540-trixie.conf delete mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf create mode 100644 meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 7c190b67..fb829b30 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -29,7 +29,7 @@ BBMULTICONFIG = " \ container-amd64-bookworm \ qemumipsel-bullseye \ qemumipsel-bookworm \ - qemuriscv64-sid \ + qemuriscv64-trixie \ bananapi-buster \ bananapi-bullseye \ bananapi-bookworm \ @@ -59,8 +59,8 @@ BBMULTICONFIG = " \ rpi-arm-v7l-bookworm \ rpi-arm64-v8-bullseye \ rpi-arm64-v8-bookworm \ - sifive-fu540-sid \ - starfive-visionfive2-sid \ + sifive-fu540-trixie \ + starfive-visionfive2-trixie \ qemuarm64-focal \ qemuarm64-jammy \ qemuarm64-noble \ diff --git a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf similarity index 67% rename from meta-isar/conf/multiconfig/qemuriscv64-sid.conf rename to meta-isar/conf/multiconfig/qemuriscv64-trixie.conf index bc691b5b..73039274 100644 --- a/meta-isar/conf/multiconfig/qemuriscv64-sid.conf +++ b/meta-isar/conf/multiconfig/qemuriscv64-trixie.conf @@ -1,8 +1,8 @@ # This software is a part of ISAR. -# Copyright (C) 2017 ilbers GmbH +# Copyright (C) 2017-2025 ilbers GmbH # Copyright (c) Siemens AG, 2019-2020 # # SPDX-License-Identifier: MIT MACHINE ?= "qemuriscv64" -DISTRO ?= "debian-sid" +DISTRO ?= "debian-trixie" diff --git a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf b/meta-isar/conf/multiconfig/sifive-fu540-sid.conf deleted file mode 100644 index 99bb7f3e..00000000 --- a/meta-isar/conf/multiconfig/sifive-fu540-sid.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) Siemens AG, 2020 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "sifive-fu540" -DISTRO ?= "debian-sid" diff --git a/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf new file mode 100644 index 00000000..841d2e5c --- /dev/null +++ b/meta-isar/conf/multiconfig/sifive-fu540-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2025 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "sifive-fu540" +DISTRO ?= "debian-trixie" diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf deleted file mode 100644 index 603e891f..00000000 --- a/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf +++ /dev/null @@ -1,7 +0,0 @@ -# -# Copyright (c) Siemens AG, 2023 -# -# SPDX-License-Identifier: MIT - -MACHINE ?= "starfive-visionfive2" -DISTRO ?= "debian-sid" diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf new file mode 100644 index 00000000..f2ccb2b8 --- /dev/null +++ b/meta-isar/conf/multiconfig/starfive-visionfive2-trixie.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2025 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "starfive-visionfive2" +DISTRO ?= "debian-trixie" diff --git a/testsuite/citest.py b/testsuite/citest.py index d0c33b1e..68881bca 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -311,19 +311,9 @@ class NoCrossTest(CIBaseTest): '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 exceptions.TestFail: - self.cancel('KFAIL') - - def test_nocross_sid(self): - targets = [ - 'mc:qemuriscv64-sid:isar-image-base', - 'mc:sifive-fu540-sid:isar-image-base', - 'mc:starfive-visionfive2-sid:isar-image-base', + 'mc:qemuriscv64-trixie:isar-image-base', + 'mc:sifive-fu540-trixie:isar-image-base', + 'mc:starfive-visionfive2-trixie:isar-image-base', ] self.init()