From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Cc: Adriaan Schmidt <adriaan.schmidt@siemens.com>,
Felix Moessbauer <felix.moessbauer@siemens.com>,
Uladzimir Bely <ubely@ilbers.de>,
Cedric Hombourger <cedric.hombourger@siemens.com>
Subject: [PATCH v3 9/9] Move riscv64 from sid-ports to regular sid
Date: Thu, 12 Oct 2023 07:16:45 +0200 [thread overview]
Message-ID: <33a23c5b16f5fa4a20185b77c5b5dc3e28041257.1697087805.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1697087805.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
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 <jan.kiszka@siemens.com>
---
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
next prev parent reply other threads:[~2023-10-12 5:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-12 5:16 [PATCH v3 0/9] HOST_ARCH, -native, riscv64, and all the rest Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 1/9] Rename BUILD_HOST_ARCH to BUILD_ARCH Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 2/9] dpkg: Drop redundant PACKAGE_ARCH initialization Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 3/9] crossvars: Adjust logic to account for -native package builds in non-cross setups Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 4/9] multiarch: Downgrade native dependencies when building in emulated environment Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 5/9] meta-isar: jh7110-u-boot-spl-tool: Rely on native annotation Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 6/9] meta-isar: jh7110-u-boot-spl-image: Fix native build Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 7/9] meta-isar: u-boot-starfive-visionfive2: Simplify build dependencies Jan Kiszka
2023-10-12 5:16 ` [PATCH v3 8/9] linux-custom: Drop unused template variable Jan Kiszka
2023-10-12 5:16 ` Jan Kiszka [this message]
2023-10-13 7:59 ` [PATCH v3 0/9] HOST_ARCH, -native, riscv64, and all the rest Uladzimir Bely
2023-10-13 8:36 ` Jan Kiszka
2023-10-16 7:15 ` Uladzimir Bely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=33a23c5b16f5fa4a20185b77c5b5dc3e28041257.1697087805.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=cedric.hombourger@siemens.com \
--cc=felix.moessbauer@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=ubely@ilbers.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox