From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7286543990069919744 X-Received: by 2002:a2e:82c5:0:b0:2bc:b54b:c03f with SMTP id n5-20020a2e82c5000000b002bcb54bc03fmr5145639ljh.5.1696530728661; Thu, 05 Oct 2023 11:32:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:1509:b0:2b9:4989:4f1a with SMTP id e9-20020a05651c150900b002b949894f1als723386ljf.1.-pod-prod-00-eu; Thu, 05 Oct 2023 11:32:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEh8uzdTuyH9yofMAXCOxE1qwywsd7uvvgz4rnhx4A/IteLedkkXfVwZ7LDNZZ9hPZuNlAu X-Received: by 2002:a05:651c:1310:b0:2c1:542d:6272 with SMTP id u16-20020a05651c131000b002c1542d6272mr1768018lja.10.1696530726672; Thu, 05 Oct 2023 11:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696530726; cv=none; d=google.com; s=arc-20160816; b=XdpDe8nh2HlkEXmpVBZzoyQ6h+Mj7n8p2dBSqmlxuyjD4B/mLCHAgf0onaoql1qAHn BSWfCjnFzRBiynck2C6//yJdmrRCuXmRb5nIVKQ217u430BF+FHuaabidHWwBDCd+nBT JqLr2T6cUtMsBSl5g5MoOMmOmHn7LyN5weBg3KwrogMCBD8zTGhGoimRWCQkatlXQTOC HsABAe4gFmnU8n+ys9rI4RBufteGatIm6tWLifzk9B6SM8A6mg7ZxdJ2qt9rRWF4xCPg I0AYQfzqsSslmym/R39t5Lux6tpGgg8WN/+PLiY4+lvxusqksA6CZmJP3g0a+7uEwU8C qEkg== 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=2vsH6WtQN0Y1Xxj6wkCF8C1BgtsHgFgXy3153XMUNxg=; fh=yRqbW8O3aFmOjK/UFxR7KoBHXIp/B4yCBNXRNY5QpV8=; b=ASobC7ufVI2wMR+KbggYVMicV11Ct9kDke6lkVdHdOHFJANUc0HgTXQzKkD98dzlNo 7YOmBcU4l5wZcnnpSrN7gdQ5ixwxKWFEZ2Xw59KO1W84YB67N/C+d8nIbhB+3YPzbF9u jIlHXvAuE9Z+h18ejUVI3wzWFsUc86yBY9fJnnbX7E80Ty5ubcugXfbwJMk5asgSfo2P APihhe4JCxhXGD8MlZeunXtKRIGkxKVfrTTTqi8bCvHg5fKhPYABuFX6W9dgA2gZ8UVB 6HKhB3H9GndVh6In6iZ+XLXo3jVdiSa1bHuo6dw8DYkqkmwb9U5qCZ5eAqQ1C/yOUFvO eQwQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NTVjVXe+; spf=pass (google.com: domain of fm-294854-20231005183206900fe7b984802d8549-rozky6@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20231005183206900fe7b984802d8549-roZkY6@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id e6-20020a05651c04c600b002b6f8d5f93csi110546lji.2.2023.10.05.11.32.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2023 11:32:06 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20231005183206900fe7b984802d8549-rozky6@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NTVjVXe+; spf=pass (google.com: domain of fm-294854-20231005183206900fe7b984802d8549-rozky6@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20231005183206900fe7b984802d8549-roZkY6@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20231005183206900fe7b984802d8549 for ; Thu, 05 Oct 2023 20:32:06 +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=2vsH6WtQN0Y1Xxj6wkCF8C1BgtsHgFgXy3153XMUNxg=; b=NTVjVXe+SgreTxB4Nb9oYcY0w1J5bCrmvOCjGZhqBwQBWK8yKxvRNpjmfz/iEioOzoVgw1 R3kjod0OZ5i0Ri2I9rhTz2qVWyPUXiyWGHRTfK0Ex8r83AF9TQTJj1VUaTHou6T/yi7uPIwG X9TLG3Z4pM335blhWNw1ni24f5BGM=; From: Jan Kiszka To: isar-users Cc: Adriaan Schmidt , Felix Moessbauer , Uladzimir Bely Subject: [PATCH 7/7] Move riscv64 from sid-ports to regular sid Date: Thu, 5 Oct 2023 20:32:03 +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: 977pXnEX+UjA 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 +++--- kas/distro/{debian-sid-ports.yaml => debian-sid.yaml} | 2 +- kas/machine/Kconfig | 6 +++--- meta-isar/conf/mc.conf | 6 +++--- .../{qemuriscv64-sid-ports.conf => qemuriscv64-sid.conf} | 2 +- .../{sifive-fu540-sid-ports.conf => sifive-fu540-sid.conf} | 2 +- ...onfive2-sid-ports.conf => starfive-visionfive2-sid.conf} | 2 +- testsuite/citest.py | 6 +++--- 8 files changed, 16 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%) 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/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