From patchwork Thu Apr 24 07:02:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Uladzimir Bely X-Patchwork-Id: 4197 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 24 Apr 2025 09:06:23 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f63.google.com (mail-ed1-f63.google.com [209.85.208.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53O76MO2015209 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 24 Apr 2025 09:06:22 +0200 Received: by mail-ed1-f63.google.com with SMTP id 4fb4d7f45d1cf-5f05d36993asf620619a12.0 for ; Thu, 24 Apr 2025 00:06:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1745478376; cv=pass; d=google.com; s=arc-20240605; b=Uyqj3yMu6L4VaXL7+//qI4PmNMFafZ40gAETRPdIVIFZar+NID+3N1yldYwU8C3dQn Nd7I0an5vdaAGDLOQYkTvaethcS6qY62GWCKN3GDThTvij78jainkmRNWIECP/sWWVDy zGcJZ290bs/gh+YQ7pZ4FHsVqUyK6mmGakFKRFKZT5qdgO20G6FwwHpdLdGZvzyFU0at WnpS5BcZ6f8Q0NyT8Cf1GNRp7+Yd8E7/thCwI1YLp8OkwDj5A94nz2FZYB+kS4Aag05N YhcbdsSLC6ZZiwZHi/IW7PgBqoAWuET+skMgbaDjtK2RR0D3IYHz9qG2pzMiZUGeviro QGkQ== 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:to:from:sender:dkim-signature; bh=Al126CmB5PdqwVUPO6rJw2SaD9FdnwGd8S0nKlrWCeo=; fh=Fyd5/sdUannBAuP9y/Yk5m+7kYs7BJa+s7lLxmuGAVs=; b=CrfGSOFyFpMlJrRGjzKmVLhL6pNgDR5QbgZc7i8mfI3FVkHGlNv0uCSFTAnIo+bkaq 11gN1EXTFAczEqgQc0DnahzGFrqbBTIQFY0n7tufK0AD26LCcCiQot63f0J9QwGT3SVg 3UWCKL0B5tLp4iucxRFojU43i2aqcTpPcPckTFHXogSqp9+JpdCHnHovZ1yzIpM1ZOx3 J3yVOPwMzS6HvqQirxZf0lSFnVesE61BwFX9qKlYttXABMZ1qkKLg8PbUsca4c6C2FnR Xnt/xFK6NNQBAiDs3MVJhKxhPWgIiMPct0FcxnAx9HZkGGA6SDlOB1/+bKQQMzaotIIn t3Zw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1745478376; x=1746083176; 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:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=Al126CmB5PdqwVUPO6rJw2SaD9FdnwGd8S0nKlrWCeo=; b=H4mNHYNa/qr7sauZPESlZLIMxkB9DprWaA3av1hY8GoR+SgMWYRgklUbpWAou43LHh qIYIBjIc7l4nX6bVY/GpDHIxNI/0E7bAUhJRJ9qPEMkRaor9onlHrNdy2FjXa84LqAid f7ypal8AMxtkrZzxIcD38hUtaIXmiuhYgjjMjaeH0G6sOAbM2gRp/sUIBvNIvxIANkex PDnbpeLys5OSb4feLMswKHGpRSDXb852DVwOPEDcjOd0+1ONZrPzfFvnBhXq5PjjNGxO F8sx4hrQJu8MQcMwVjna0BEJQJKaxaEqWIX6ONqi3wWuAQhRTM1ssO3+6Q1ZobenkHxx Z2lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745478376; x=1746083176; 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:to:from:x-beenthere :x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=Al126CmB5PdqwVUPO6rJw2SaD9FdnwGd8S0nKlrWCeo=; b=vHghd5mQbZdkIBRPnXWOjf0xzskdu7W0VPDl6aFjBVhKv/ArE5i/XupBO5FmZLoBou yk52HHW7YIvRUmuRQShYoXacNvBQi+Veok6gAcdJaOe09LQ/GublURZRkRIuZEOTrJoB tUYlejEAg3FpaugrjdsqW1wavESTWw3m7IagCqVQRETokxp/b/tG3y0I22bVke57Te5z todD8l2PuR17Rqr4DNjyWvQe2jixcOvPg03uGHxAP4+BkM4d4tz7YalwcLsPIlYTgWl3 OgfZqs7iyXZeH6K4VXbzbEKfziIm65VVZVtt8gvaqKMS1XmvDCJQYX7lcRjaGJSFMFnx vFVQ== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCVgYmoOr33t2GtHmpwx0vSV66NVWk53yIRxjBMZs0p/om63AC3Y+Wg3aGGkhBaef/+fS7sNWX4=@isar-build.org X-Gm-Message-State: AOJu0YzUqgGK9Q2yJqVOzDT2lgVHf0nOlhNyhlP5GUu2SZz11iTABjEG RryDw9CPn+HhcXE6pWcnxBqudwDMa05HjrOl8A+hMOdyTJMreYkn X-Google-Smtp-Source: AGHT+IE2GJzMq3I3mYQxCnpQ0XhisokVxD80N5c0pFUNWQDW8EcAJzCk3GTSfltkztLFqq1Go7f4pg== X-Received: by 2002:a05:6402:26d2:b0:5dc:c943:7b6 with SMTP id 4fb4d7f45d1cf-5f6ddb0c5c0mr1619381a12.3.1745478375420; Thu, 24 Apr 2025 00:06:15 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJlO6vHvqX2v9jCn39y77njGReDD4xsSk2J8e7koMYtlg== Received: by 2002:a05:6402:2789:b0:5dc:cf28:2128 with SMTP id 4fb4d7f45d1cf-5f6dbffaf40ls70169a12.0.-pod-prod-03-eu; Thu, 24 Apr 2025 00:06:13 -0700 (PDT) X-Received: by 2002:a17:907:3fa6:b0:ace:3ef4:2964 with SMTP id a640c23a62f3a-ace57429f8cmr148822166b.49.1745478372812; Thu, 24 Apr 2025 00:06:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1745478372; cv=none; d=google.com; s=arc-20240605; b=bXkveJX5dSH1ynRVHZBYYA4Fm/8BSmrS7uug0w9MxsCplutGznr/xBFGyx5Gy2tUW4 ArMxXtoEbdGUPDNEE+tGY96Ywa4TInMLjvUogNH9+PJxZbasBTipAtOa0b5IH1B+Vmuf bjSQtI8DyiMU4sPuNhC2FYYS/KeedyOe+6fTbYBMq545n0jgPAiAESNf2Pd4bNfTSvpG 2t2/R/i7IjAXrDbR0FJtpmrZpoUPbRAZi5rZ//s4FD4SoQz9solGnY/lmxpwGE5TzzpU fujve8w+a0bSU8A/kVU5kdGhGzhgYoTxhcg+7l3tgS0Pts0l9ubMdrSA/I1GyYTE+hJj sC0g== 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:to:from; bh=HxkA/3NEOFMUEXJGG5F4osXb7HkJoUmYYbYU/2GkiCs=; fh=7tclEdh7YbwSQowgJ6LNq720O7H5HTEaqj22NJWRE2E=; b=EIKGZLjtCImDsAf5qPz6ey2tiT7yLS7lGBNpdSyGWV9OcxjPLQZR3pVFkMYtcNjX/w VUziCisnDD3tulk28PpbVHGUnv2woHjW2bAQFTIwYqF9SHwAdu1WdKOX6PkrwC0QtKV+ 1V4qBT4ixx68eRDtmwBlYCT6bPu1JUQv6idJqRAtLs9SpmXncvGsySb2x/7IkJlWAszb 4NQjpLKX4wwEND3/iZoJMbuopR6UUGO/zZz2VvGvgoOHL7gpMEIQ9yQujuGIiZYJ9ohV DrOvNUWqsIBETG08GglgCjs2yDtXzGhaSLjBJSDzCbFXd54KZia5zqDMKuPuKYFa7UpB QA2Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 4fb4d7f45d1cf-5f6ee1601e0si21649a12.3.2025.04.24.00.06.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 24 Apr 2025 00:06:12 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from home.localdomain (44-208-124-178-static.mgts.by [178.124.208.44] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 53O76BCc015178 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 24 Apr 2025 09:06:12 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH 1/2] meta-isar: Add ubuntu-ports riscv64 support in Isar Date: Thu, 24 Apr 2025 10:02:23 +0300 Message-ID: <20250424070606.11003-2-ubely@ilbers.de> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250424070606.11003-1-ubely@ilbers.de> References: <20250424070606.11003-1-ubely@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: ubely@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@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?= Ubuntu ports provides not only arm64/armhf architectures we currently support in Isar, but also some other architectures. Provide possibility to build ubuntu/riscv64 targets. Also, change kas configuration to allow selecting ubuntu-noble for qemuriscv64 build without enabling ANY_MACHINE_DISTRO option. Signed-off-by: Uladzimir Bely --- kas/machine/Kconfig | 2 ++ meta-isar/conf/distro/ubuntu-common.inc | 5 ++++- meta-isar/conf/distro/ubuntu-noble-ports.list | 12 ++++++------ meta-isar/conf/machine/qemuriscv64.conf | 3 +++ meta-isar/conf/mc.conf | 1 + meta-isar/conf/multiconfig/qemuriscv64-noble.conf | 7 +++++++ 6 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 meta-isar/conf/multiconfig/qemuriscv64-noble.conf diff --git a/kas/machine/Kconfig b/kas/machine/Kconfig index 8c334a8f..82e2715d 100644 --- a/kas/machine/Kconfig +++ b/kas/machine/Kconfig @@ -168,6 +168,8 @@ config MACHINE_QEMU_RISCV64 select DISTRO_DEBIAN select CODENAME_TRIXIE select CODENAME_SID + select DISTRO_UBUNTU + select CODENAME_NOBLE select ARCH_RISCV64 config MACHINE_RPI_ARM_V7 diff --git a/meta-isar/conf/distro/ubuntu-common.inc b/meta-isar/conf/distro/ubuntu-common.inc index 88a3b4f0..fac61fbe 100644 --- a/meta-isar/conf/distro/ubuntu-common.inc +++ b/meta-isar/conf/distro/ubuntu-common.inc @@ -12,6 +12,9 @@ HOST_BASE_DISTRO = "${BASE_DISTRO}" DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list" HOST_DISTRO_APT_SOURCES:arm64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list" +DISTRO_APT_SOURCES:riscv64 ?= "conf/distro/${BASE_DISTRO}-${BASE_DISTRO_CODENAME}-ports.list" +HOST_DISTRO_APT_SOURCES:riscv64 ?= "conf/distro/${HOST_DISTRO}.list conf/distro/${HOST_DISTRO}-ports.list" + BOOTSTRAP_KEY = "file://${LAYERDIR_isar}/conf/distro/ubuntu.public.key;sha256sum=36a38199a4bf4eae1e7f574891f7dfcb79b91b87a33a499383265e1224b5e989" DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" HOST_DISTRO_BOOTSTRAP_KEYS += "${BOOTSTRAP_KEY}" @@ -21,7 +24,7 @@ DISTRO_BOOTSTRAP_BASE_PACKAGES:append:focal = " usrmerge" DISTRO_BOOTSTRAP_BASE_PACKAGES:append:jammy = " usrmerge" # kernel package name is linux-image-generic in Ubuntu -KERNEL_NAME = "generic" +KERNEL_NAME ?= "generic" # that is what debootstrap_1.0.118ubuntu1 does anyways DISTRO_DEBOOTSTRAP_SCRIPT = "/usr/share/debootstrap/scripts/gutsy" diff --git a/meta-isar/conf/distro/ubuntu-noble-ports.list b/meta-isar/conf/distro/ubuntu-noble-ports.list index adeb2639..9b101e3d 100644 --- a/meta-isar/conf/distro/ubuntu-noble-ports.list +++ b/meta-isar/conf/distro/ubuntu-noble-ports.list @@ -1,6 +1,6 @@ -deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse -deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse -deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse -deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse -deb [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse -deb-src [arch=armhf,arm64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse +deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble main restricted universe multiverse +deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble-updates main restricted universe multiverse +deb [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse +deb-src [arch=armhf,arm64,riscv64] http://ports.ubuntu.com/ubuntu-ports noble-security main restricted universe multiverse diff --git a/meta-isar/conf/machine/qemuriscv64.conf b/meta-isar/conf/machine/qemuriscv64.conf index b9656090..3f14727a 100644 --- a/meta-isar/conf/machine/qemuriscv64.conf +++ b/meta-isar/conf/machine/qemuriscv64.conf @@ -7,6 +7,9 @@ DISTRO_ARCH ?= "riscv64" KERNEL_NAME ?= "riscv64" +KERNEL_NAME:ubuntu ?= "generic" +KERNEL_NAME:ubuntu-jammy ?= "generic" +KERNEL_NAME:ubuntu-noble ?= "generic" IMAGE_FSTYPES ?= "ext4" ROOTFS_EXTRA ?= "128" diff --git a/meta-isar/conf/mc.conf b/meta-isar/conf/mc.conf index 55969c7b..322c89b2 100644 --- a/meta-isar/conf/mc.conf +++ b/meta-isar/conf/mc.conf @@ -69,6 +69,7 @@ BBMULTICONFIG = " \ qemuamd64-focal \ qemuamd64-jammy \ qemuamd64-noble \ + qemuriscv64-noble \ qemuamd64-sid \ qemuarm64-sid \ " diff --git a/meta-isar/conf/multiconfig/qemuriscv64-noble.conf b/meta-isar/conf/multiconfig/qemuriscv64-noble.conf new file mode 100644 index 00000000..9a2b0430 --- /dev/null +++ b/meta-isar/conf/multiconfig/qemuriscv64-noble.conf @@ -0,0 +1,7 @@ +# This software is a part of Isar. +# Copyright (C) 2025 ilbers GmbH +# +# SPDX-License-Identifier: MIT + +MACHINE ?= "qemuriscv64" +DISTRO ?= "ubuntu-noble"