From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a05:6402:28a:b0:538:8d4:2077 with SMTP id l10-20020a056402028a00b0053808d42077mr7580206edv.13.1696606507617; Fri, 06 Oct 2023 08:35:07 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d3d1:0:b0:531:2f5:1f0d with SMTP id o17-20020aa7d3d1000000b0053102f51f0dls429463edr.1.-pod-prod-01-eu; Fri, 06 Oct 2023 08:35:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHFpwoGkFdSmTg/83cWjtn4cEELSx5dtw0ip3wnBhSfBv/oDJtud3hj51Ez97lxWrKfhOJg X-Received: by 2002:a17:906:5dae:b0:9b9:8f9c:c76e with SMTP id n14-20020a1709065dae00b009b98f9cc76emr5859647ejv.22.1696606505570; Fri, 06 Oct 2023 08:35:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696606505; cv=none; d=google.com; s=arc-20160816; b=TsciSCDwpnu5rDFzZ3Q79gwtYU9+0DPvayeOMtSXPfsYn54Q50dKPhCK+GqLUxTmeZ h1R8ZHOlaNJxC+1Wr9adP1ZayG9+x5Y1sdsp+fQrDwfqUw2yxOowek/yjWtxeTdlMnxf hO5YFT61tRyZrMOuFdmPnqSjDhXrcBTyfubKj6VyPX/fD1EL065dAcJYDWNKdUvdJ1/e tp9RCcw/7EhzIKp8T4taHmV4mrmPRKYMIA1CTDLEYAM+81Wxho6O8V/kj3mhhM/JpBAI M60uw4q60idGRr2CSc8l4xje9KSJ8ImjBPg8QCjjbcQuatzr9lVc9k5StZDZe05rMoMU cTbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=qpU5LY+JDZLXoJekafN01Okrg8DnJqEDs8+7/r8Xio4=; fh=oMwV7fLMNO6+b1+J7DgRaIeS6HOdhYK0IzT7NJ4piPQ=; b=wT4ir38i1FRH+PhAPyTVoU4jOEQBmFEq3nbcaZEnzXcJ824slriblFbdkSoj/A6Kjf u4W/+YuGu0y+m97Jwzlf/+ZwmCq7hEi6/L/EA85SgNEIAoFHwwE8+vxmhqiA3iC17Qv9 R6ew2oeK4g0+p14jFwJ6HD8AR+87QQAnMMydzl4kObQqHl48N+lszJZwaTDIVKzoP4fu oryrCvVwNhhdnYbZcavH3zXXGDKyaN791ZdNV644v/UWvC2BoKrtqtGigEwGYZ+Z0dGQ Swk3Wr5oK04CP638Dyo0d58qRkBKSR8v3X9UmvL4x9hZjjOc6pmZXKoQjl6BKbexZWSr C3UQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IaEbKbsU; spf=pass (google.com: domain of fm-294854-202310061535056a42f806a72a5d86ae-tlvjjw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202310061535056a42f806a72a5d86ae-tLVjjW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-225.siemens.flowmailer.net (mta-65-225.siemens.flowmailer.net. [185.136.65.225]) by gmr-mx.google.com with ESMTPS id qf32-20020a1709077f2000b009adbab54deesi274431ejc.2.2023.10.06.08.35.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 Oct 2023 08:35:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-202310061535056a42f806a72a5d86ae-tlvjjw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) client-ip=185.136.65.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=IaEbKbsU; spf=pass (google.com: domain of fm-294854-202310061535056a42f806a72a5d86ae-tlvjjw@rts-flowmailer.siemens.com designates 185.136.65.225 as permitted sender) smtp.mailfrom=fm-294854-202310061535056a42f806a72a5d86ae-tLVjjW@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-65-225.siemens.flowmailer.net with ESMTPSA id 202310061535056a42f806a72a5d86ae for ; Fri, 06 Oct 2023 17:35:05 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=qpU5LY+JDZLXoJekafN01Okrg8DnJqEDs8+7/r8Xio4=; b=IaEbKbsU5oHkXOjnJ9m4Up29PKvoEu9T23Yi8r8Ee+BAMg552PgIltR6Hm+S4cEXAd8d6U nBjVlU+wCyYc6Pf9ul7fU53g2yzrL8AUwFpWHnbPy9IGs4CBAkTLo6kXUHtusNl5QHDV6PRR 2ysNi+iAwJPt+FOvfOoFptPuV+DsQ=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely , Cedric Hombourger Subject: [PATCH v2 9/9] Move riscv64 from sid-ports to regular sid Date: Fri, 6 Oct 2023 17:35:02 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: Wpm8M/kX+nWh From: Jan Kiszka Now that riscv64 is an official Debian arch, sid-ports runs out of sync with sid. It seems that sid is generally building riscv64 fine, but cross-compilation will remain broken for a longer while. Signed-off-by: Jan Kiszka --- kas/distro/Kconfig | 6 +++--- ...{debian-sid-ports.yaml => debian-sid.yaml} | 2 +- kas/machine/Kconfig | 6 +++--- meta-isar/conf/mc.conf | 6 +++--- ...64-sid-ports.conf => qemuriscv64-sid.conf} | 2 +- ...0-sid-ports.conf => sifive-fu540-sid.conf} | 2 +- ...rts.conf => starfive-visionfive2-sid.conf} | 2 +- meta/conf/distro/debian-sid.conf | 21 +++++++++++++++++++ testsuite/citest.py | 6 +++--- 9 files changed, 37 insertions(+), 16 deletions(-) rename kas/distro/{debian-sid-ports.yaml => debian-sid.yaml} (78%) rename meta-isar/conf/multiconfig/{qemuriscv64-sid-ports.conf => qemuriscv64-sid.conf} (85%) rename meta-isar/conf/multiconfig/{sifive-fu540-sid-ports.conf => sifive-fu540-sid.conf} (76%) rename meta-isar/conf/multiconfig/{starfive-visionfive2-sid-ports.conf => starfive-visionfive2-sid.conf} (78%) create mode 100644 meta/conf/distro/debian-sid.conf diff --git a/kas/distro/Kconfig b/kas/distro/Kconfig index bd762a98..5118dff4 100644 --- a/kas/distro/Kconfig +++ b/kas/distro/Kconfig @@ -19,8 +19,8 @@ config DEBIAN_BULLSEYE config DEBIAN_BOOKWORM bool "Debian Bookworm (12)" -config DEBIAN_SID_PORTS - bool "Debian Sid (unstable) with unofficial ports" +config DEBIAN_SID + bool "Debian Sid (unstable)" config RASPIOS_BULLSEYE bool "Raspi OS Bullseye (11)" @@ -38,7 +38,7 @@ config KAS_INCLUDE_DISTRO default "kas/distro/debian-buster.yaml" if DEBIAN_BUSTER default "kas/distro/debian-bullseye.yaml" if DEBIAN_BULLSEYE default "kas/distro/debian-bookworm.yaml" if DEBIAN_BOOKWORM - default "kas/distro/debian-sid-ports.yaml" if DEBIAN_SID_PORTS + default "kas/distro/debian-sid.yaml" if DEBIAN_SID default "kas/distro/raspios-bullseye.yaml" if RASPIOS_BULLSEYE default "kas/distro/ubuntu-focal.yaml" if UBUNTU_FOCAL default "kas/distro/ubuntu-jammy.yaml" if UBUNTU_JAMMY diff --git a/kas/distro/debian-sid-ports.yaml b/kas/distro/debian-sid.yaml similarity index 78% rename from kas/distro/debian-sid-ports.yaml rename to kas/distro/debian-sid.yaml index 52993646..43f1c696 100644 --- a/kas/distro/debian-sid-ports.yaml +++ b/kas/distro/debian-sid.yaml @@ -4,4 +4,4 @@ header: version: 14 -distro: debian-sid-ports +distro: debian-sid diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 66debfe5..d0e3963a 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -68,7 +68,7 @@ config MACHINE_QEMU_MIPSEL config MACHINE_QEMU_RISCV64 bool "qemuriscv64" - depends on DEBIAN_SID_PORTS + depends on DEBIAN_SID config MACHINE_RPI_ARM_V7 bool "rpi-arm-v7" @@ -88,11 +88,11 @@ config MACHINE_RPI_ARM64_V8 config MACHINE_SIFIVE_FU540 bool "sifive-fu540" - depends on DEBIAN_SID_PORTS + depends on DEBIAN_SID config MACHINE_STARFIVE_VISIONFIVE2 bool "starfive-visionfive2" - depends on DEBIAN_SID_PORTS + depends on DEBIAN_SID config MACHINE_STM32MP15X bool "stm32mp15x" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 9637bcb1..d16f54b5 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -25,7 +25,7 @@ BBMULTICONFIG = " \ qemumipsel-buster \ qemumipsel-bullseye \ qemumipsel-bookworm \ - qemuriscv64-sid-ports \ + qemuriscv64-sid \ bananapi-buster \ bananapi-bullseye \ de0-nano-soc-buster \ @@ -45,8 +45,8 @@ BBMULTICONFIG = " \ rpi-arm-v7-bullseye \ rpi-arm-v7l-bullseye \ rpi-arm64-v8-bullseye \ - sifive-fu540-sid-ports \ - starfive-visionfive2-sid-ports \ + sifive-fu540-sid \ + starfive-visionfive2-sid \ qemuarm64-focal \ qemuarm64-jammy \ qemuamd64-focal \ diff --git a/meta-isar/conf/multiconfig/qemuriscv64-sid-ports.conf b/meta-isar/conf/multiconfig/qemuriscv64-sid.conf similarity index 85% rename from meta-isar/conf/multiconfig/qemuriscv64-sid-ports.conf rename to meta-isar/conf/multiconfig/qemuriscv64-sid.conf index 2556cf7f..bc691b5b 100644 --- a/meta-isar/conf/multiconfig/qemuriscv64-sid-ports.conf +++ b/meta-isar/conf/multiconfig/qemuriscv64-sid.conf @@ -5,4 +5,4 @@ # SPDX-License-Identifier: MIT MACHINE ?= "qemuriscv64" -DISTRO ?= "debian-sid-ports" +DISTRO ?= "debian-sid" diff --git a/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf b/meta-isar/conf/multiconfig/sifive-fu540-sid.conf similarity index 76% rename from meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf rename to meta-isar/conf/multiconfig/sifive-fu540-sid.conf index 313032ef..99bb7f3e 100644 --- a/meta-isar/conf/multiconfig/sifive-fu540-sid-ports.conf +++ b/meta-isar/conf/multiconfig/sifive-fu540-sid.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT MACHINE ?= "sifive-fu540" -DISTRO ?= "debian-sid-ports" +DISTRO ?= "debian-sid" diff --git a/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf b/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf similarity index 78% rename from meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf rename to meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf index ee42ab4d..603e891f 100644 --- a/meta-isar/conf/multiconfig/starfive-visionfive2-sid-ports.conf +++ b/meta-isar/conf/multiconfig/starfive-visionfive2-sid.conf @@ -4,4 +4,4 @@ # SPDX-License-Identifier: MIT MACHINE ?= "starfive-visionfive2" -DISTRO ?= "debian-sid-ports" +DISTRO ?= "debian-sid" diff --git a/meta/conf/distro/debian-sid.conf b/meta/conf/distro/debian-sid.conf new file mode 100644 index 00000000..631f9b5a --- /dev/null +++ b/meta/conf/distro/debian-sid.conf @@ -0,0 +1,21 @@ +# This software is a part of ISAR. +# +# Copyright (c) Siemens AG, 2020-2023 +# +# SPDX-License-Identifier: MIT + +require debian-common.conf + +BASE_DISTRO_CODENAME = "sid" + +HOST_DISTRO ?= "debian-${BASE_DISTRO_CODENAME}" + +DISTRO_CONFIG_SCRIPT ?= "debian-configscript.sh" +DISTRO_KERNELS ?= "4kc-malta 5kc-malta 686-pae 686 alpha-generic alpha-smp \ + amd64 arm64 armmp-lpae armmp cloud-amd64 cloud-arm64 itanium \ + loongson-3 m68k marvell mckinley mips32r6 mips32r6el mips64r6 \ + mips64r6el octeon parisc parisc64 powerpc-smp powerpc powerpc64 \ + powerpc64le riscv64 rpi rt-686-pae rt-amd64 rt-arm64 rt-armmp \ + s390x sh7751r sh7785lcr sparc64-smp sparc64" + +DISTRO_GCC = "13" diff --git a/testsuite/citest.py b/testsuite/citest.py index 7304efe6..81bdeba5 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -227,10 +227,10 @@ class NoCrossTest(CIBaseTest): except: self.cancel('KFAIL') - def test_nocross_sidports(self): + def test_nocross_sid(self): targets = [ - 'mc:qemuriscv64-sid-ports:isar-image-base', - 'mc:sifive-fu540-sid-ports:isar-image-base', + 'mc:qemuriscv64-sid:isar-image-base', + 'mc:sifive-fu540-sid:isar-image-base', ] self.init() -- 2.35.3