From nobody Tue Oct 28 08:18:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1760150178696408.4844014266545; Fri, 10 Oct 2025 19:36:18 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 7C77741B64; Fri, 10 Oct 2025 22:36:15 -0400 (EDT) Received: from [172.19.199.20] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 5307E44389; Fri, 10 Oct 2025 22:35:16 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 5F18141A62; Fri, 10 Oct 2025 22:34:32 -0400 (EDT) Received: from mx3.osci.io (carla.osci.io [52.43.158.29]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 1D34541886 for ; Fri, 10 Oct 2025 22:34:30 -0400 (EDT) Received: by mx3.osci.io (Postfix, from userid 994) id 52B631823524; Sat, 11 Oct 2025 02:26:16 +0000 (UTC) Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by mx3.osci.io (Postfix) with ESMTP id 708C51823518 for ; Sat, 11 Oct 2025 02:26:13 +0000 (UTC) Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8BxXNI6wOloB+sUAA--.44858S3; Sat, 11 Oct 2025 10:26:03 +0800 (CST) Received: from localhost.localdomain (unknown [113.200.148.30]) by front1 (Coremail) with SMTP id qMiowJAxE+Q4wOlo243ZAA--.24139S4; Sat, 11 Oct 2025 10:26:01 +0800 (CST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 X-Greylist: delayed 492 seconds by postgrey-1.37 at lists.libvirt.org; Fri, 10 Oct 2025 22:34:31 EDT X-Greylist: delayed 2176 seconds by postgrey-1.37 at carla.osci.io; Sat, 11 Oct 2025 02:26:13 UTC From: yangzewei@loongson.cn To: devel@lists.libvirt.org Subject: [PATCH v3] libvirt-ci: remove obsolete RISC-V ports setup for Debian 13+ Date: Sat, 11 Oct 2025 10:26:00 +0800 Message-ID: <20251011022600.175455-1-yangzewei@loongson.cn> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJAxE+Q4wOlo243ZAA--.24139S4 X-CM-SenderInfo: p1dqw6phzhxqxorr0wxvrqhubq/1tbiAQEMDGjooCoTbQADs3 X-Coremail-Antispam: 1Uk129KBj93XoWxAw1DXrWkXr4kWFyUGFWxGrX_yoW5Cw1kpF Za939ru3ykX3W8GrsrG3yUWFWUJwn3GryUWF4ftryFkr9xGFyvqr1Fka4ftFWUXF9xAayj qFs8KF43Ga1293gCm3ZEXasCq-sJn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUkKb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I0E14v2 6F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc804VCY07AIYIkI8VC2zVCFFI0UMc 02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAF wI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4kE6xkIj40Ew7 xC0wCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E14v2 6r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_JrylIxkGc2 Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_ Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMI IF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvfC2KfnxnUUI43ZEXa7IU8j9aPUUUUU= = Message-ID-Hash: KBJCMMO5P5JKWTYBLEZOZKUMQH4XVVJW X-Message-ID-Hash: KBJCMMO5P5JKWTYBLEZOZKUMQH4XVVJW X-MailFrom: yangzewei@loongson.cn X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZM-MESSAGEID: 1760150182864158500 Content-Type: text/plain; charset="utf-8" From: yzewei This patch combines previous v1 and v2 patches, Please ignore previous patc= hes v1 and v2. - Remove obsolete RISC-V ports setup for Debian 13+ Debian 13 and later officially support riscv64, so the old debian-ports archive keyring and sources.list configuration are no longer necessary. - Add validation to forbid RISC-V cross compilation on Debian < 13 Ensures that cross compiling for riscv64 on unsupported Debian releases fails early with a clear error message. Signed-off-by: yzewei --- lcitool/formatters.py | 15 --------------- lcitool/projects.py | 2 +- lcitool/util.py | 4 +++- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/lcitool/formatters.py b/lcitool/formatters.py index c26cf22a..af171fae 100644 --- a/lcitool/formatters.py +++ b/lcitool/formatters.py @@ -456,21 +456,6 @@ class BuildEnvFormatter(Formatter): "dpkg --add-architecture {cross_arch_deb}", ] ) - if target.cross_arch =3D=3D "riscv64": - cross_commands.extend( - [ - "{nosync}{packaging_command} install debian-ports-= archive-keyring", - "{nosync}echo 'deb http://ftp.ports.debian.org/deb= ian-ports/ sid main' > /etc/apt/sources.list.d/ports.list", - "{nosync}echo 'deb http://ftp.ports.debian.org/deb= ian-ports/ unreleased main' >> /etc/apt/sources.list.d/ports.list", - ] - ) - cross_commands.extend( - [ - "{nosync}{packaging_command} update", - "{nosync}{packaging_command} dist-upgrade -y", - "{nosync}{packaging_command} install --no-install-reco= mmends -y dpkg-dev", - ] - ) if varmap["cross_pkgs"]: cross_commands.extend( [ diff --git a/lcitool/projects.py b/lcitool/projects.py index f1187cb2..0324f21a 100644 --- a/lcitool/projects.py +++ b/lcitool/projects.py @@ -270,7 +270,7 @@ class Project: target_name =3D f"{target_name}" else: try: - util.validate_cross_platform(target.cross_arch, osname) + util.validate_cross_platform(target.cross_arch, osname, os= version) except ValueError as ex: raise ProjectError(str(ex)) target_name =3D f"{target_name}-{target.cross_arch}-cross" diff --git a/lcitool/util.py b/lcitool/util.py index 3f5cb870..aedf3882 100644 --- a/lcitool/util.py +++ b/lcitool/util.py @@ -409,10 +409,12 @@ class DataDir: return result =20 =20 -def validate_cross_platform(cross_arch: str, osname: str) -> None: +def validate_cross_platform(cross_arch: str, osname: str, osversion: str) = -> None: if osname not in ["Debian", "Fedora"]: raise ValueError(f"Cannot cross compile on {osname}") if osname =3D=3D "Debian" and cross_arch.startswith("mingw"): raise ValueError(f"Cannot cross compile for {cross_arch} on {osnam= e}") if osname =3D=3D "Fedora" and not cross_arch.startswith("mingw"): raise ValueError(f"Cannot cross compile for {cross_arch} on {osnam= e}") + if osname =3D=3D "Debian" and cross_arch =3D=3D "riscv64" and int(osve= rsion.split('.')[0]) < 13: + raise ValueError(f"Cross compiling for {cross_arch} is not support= ed on Debian < 13") --=20 2.43.0