From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 0/2] Fix qemu build Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62309@debbugs.gnu.org Cc: Josselin Poiret X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167935103129842 (code B ref -1); Mon, 20 Mar 2023 22:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 20 Mar 2023 22:23:51 +0000 Received: from localhost ([127.0.0.1]:57074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNuw-0007lG-My for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:23:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:60380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNuv-0007l8-24 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNuu-0008Sq-JQ for guix-patches@gnu.org; Mon, 20 Mar 2023 18:23:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNus-0007NW-Vh for guix-patches@gnu.org; Mon, 20 Mar 2023 18:23:48 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 7E26A184D6B; Mon, 20 Mar 2023 22:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XVjv7VHYmxrb8k+z31dTDiKie4QBqfxiNZ3Ff/Hmzt8=; b=h+MUM0cQaaGMbhxbn+tDsEN+5N6dG4CS7p8XU69wgVrNbJVtABRarVZnvA+JPShD12AC/A PlCQs8lZJ2513m7ArJDtm1eQFsfwXPbO84XLw3jtfhLMdFjyPsYwyio/bA7bQUo1gofdKq JEWYoJDbHQv2xa/tVTVXQA/KfF7DnNkWuk/KardafC4CW3DpL2VbwvTKtUbsVpqp8EzffL DJeGxGf9l23y+6x5viKIvWo7maKuPvABYnnUW1wS4VYg4x841N73n/6BrRv2tdj4E3jqNn d+Vo0lo3jJza3pU0tdDTR/gJWuWdb5oUaMaGUCjo0LNgfedrO3eRMDQDMGN9DA== From: Josselin Poiret Date: Mon, 20 Mar 2023 23:23:38 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, Quick patches to fix some dependencies of QEMU that didn't build on my side! Best, Josselin Poiret (2): opensbi: Build with default gcc, with microarch rv64g u-boot: Fix build under Python 3.10. gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ gnu/packages/firmware.scm | 4 ++- .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 1/2] opensbi: Build with default gcc, with microarch rv64g Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167935120330159 (code B ref 62309); Mon, 20 Mar 2023 22:27:01 +0000 Received: (at 62309) by debbugs.gnu.org; 20 Mar 2023 22:26:43 +0000 Received: from localhost ([127.0.0.1]:57087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxj-0007qM-FD for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:43 -0400 Received: from jpoiret.xyz ([206.189.101.64]:49018) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxh-0007qC-CV for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:41 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3528D184D6B; Mon, 20 Mar 2023 22:26:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FDFUe6AlDIhtAsRF6tTl2Oy2tO67gdOdiuF/f0a043E=; b=s+fU8K6s+wdfJnNeulE2Tbh2aqc7qVaRBN/UfVTWuJ0HjnKHnxRHNgJW6nKb5ADfUDgGFh RgDehrO0hPweLZrXqHiYFhRiG6+KMVwdmu3oytUwzDsMOuaZ5KJPmTClbLhgir6dKGKHkh oZ/3qw09FDC0WHHtcIfLtFY81b4QzWODc6S4fDa4jKdnJtLYdI03vvJFMXJeRMSC3KCdef 4oJ7EGur+o9UcB3d3U/sX3DHrpC1PzZlLEt4gg7k3alKxe+Dx9+O+XhTE4f08LQoC8rq6/ n3PcayTXICXLZ29pHgg42uo1ODwd+NVXSgAyLK3fcvIC9LLLSBfE7NFlqLh8CQ== From: Josselin Poiret Date: Mon, 20 Mar 2023 23:26:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/firmware.scm (make-opensbi-package): Do it. --- gnu/packages/firmware.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 956ece5d6d..9b9443effe 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) '()))) (arguments @@ -499,6 +499,8 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) `("CC=gcc")) "FW_PAYLOAD=n" "V=1") + ;; fence.i instructions are used, so we need a non-default micro arch + #:configure-flags (list "-march=rv64g") #:phases (modify-phases %standard-phases (delete 'configure) -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 2/2] u-boot: Fix build under Python 3.10. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 20 Mar 2023 22:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret , 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167935120830177 (code B ref 62309); Mon, 20 Mar 2023 22:27:01 +0000 Received: (at 62309) by debbugs.gnu.org; 20 Mar 2023 22:26:48 +0000 Received: from localhost ([127.0.0.1]:57089 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxn-0007qf-Pe for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]:49088) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNxi-0007qK-UM for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 18:26:46 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 1E325185317; Mon, 20 Mar 2023 22:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4L9q0bG/iJL8EYBgRaHWW3os0DvdWFOZNPR1mLop+Qg=; b=OXXQDTLYPnBwEkLmWwjChmTxqoz2tQ7Qz96hiYeXDISCICGMPTScwYvz0LSCkHpERuaxqk +ndxVjgo+egFxfsoMoj84rpSbgpe5+SQbrFZi1EB+3x4SALYsSmMdRsS1V+ObJvOGpbZOs an36esWD1+MQzdo6kKog3J872VziLQl1oXV54C85n/xU+VnHE9FRzXJC/xRVWm9WVf9yxU /0Pglt59Y9aRJ1SbNSZwzwbp6x29/W8gwDE9oipay9QenmAv8h4o7jnqFQdM0+8q8558XS zPy4oUGhO1LZRJ/Wm2dw9mBolBtAWC5d4Xfgn/GzUp9b1gPTIiU3NSCejhjc4w== From: Josselin Poiret Date: Mon, 20 Mar 2023 23:26:37 +0100 Message-Id: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (u-boot): Apply patch. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 058b23c683..20bf2bea77 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ %D%/packages/patches/u-boot-infodocs-target.patch \ %D%/packages/patches/u-boot-patman-guix-integration.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ac269807be..457f3b3994 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -655,6 +655,9 @@ (define u-boot %u-boot-allow-disabling-openssl-patch %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch + ;; FIXME The following patch is backported from 2023.01, + ;; remove when updating. + (search-patch "u-boot-fix-build-python-3.10.patch") (search-patch "u-boot-infodocs-target.patch") (search-patch "u-boot-patman-guix-integration.patch"))) (method url-fetch) diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch new file mode 100644 index 0000000000..27c03f92f4 --- /dev/null +++ b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch @@ -0,0 +1,35 @@ +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Thu, 13 Oct 2022 22:43:41 +0200 +Subject: [PATCH] libfdt: Fix build with python 3.10 + +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in +swig 4.10 but it is not clear when it will be released. There was a +warning since python 3.8. + +Link: https://github.com/swig/swig/pull/2277 + +Signed-off-by: Michal Suchanek +Reviewed-by: Simon Glass +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 27c29ea260..56cc5d48f4 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -7,6 +7,10 @@ + + %module libfdt + ++%begin %{ ++#define PY_SSIZE_T_CLEAN ++%} ++ + %include + + %{ +-- +GitLab + -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 0/2] Fix qemu build Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 01:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167936219525041 (code B ref 62309); Tue, 21 Mar 2023 01:30:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 01:29:55 +0000 Received: from localhost ([127.0.0.1]:57193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQp1-0006Vo-8P for submit@debbugs.gnu.org; Mon, 20 Mar 2023 21:29:55 -0400 Received: from mail-qv1-f42.google.com ([209.85.219.42]:40751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQoy-0006Va-QQ for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 21:29:53 -0400 Received: by mail-qv1-f42.google.com with SMTP id qh28so9092076qvb.7 for <62309@debbugs.gnu.org>; Mon, 20 Mar 2023 18:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679362187; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=hnDETlkI9WhurFJ4VxBnS7OhugFHaHsvF+NDBTreyXo=; b=otKu29i6Cra8yD8qoSNWxesf4lZH5QYJi/7iJuOTFOspHgD7+uJQC4g2ksB1wqyxeX EZKvAY2Yjt4whoVYpZ1qKIvMtkXYaSxTQBsuOze0jOkegfSWXqvKAZj89lM4zjBHCaAA tcKgLEfc36WIgy+wtk+A05qKIqmTxYe5zByYguDF8Q2k/fToNP0HwRMcgz5FlzczEjhF +I14Xd7y0rUU3P7kfRI22v+hE20dAXiTt0eoRtvePf+YWagRqLoRPWPZtU57sN7tr8eM OeyQwEmoYmwQqjK7nYXd2RSX2+vxdRPHDM7s6Inj3kJFeapDGP0GcRHCwBKacsWzI03E zqiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679362187; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=hnDETlkI9WhurFJ4VxBnS7OhugFHaHsvF+NDBTreyXo=; b=BDTHRivREE8X5iB26EqrF5eJpvaTYT4XoiBW+cMhi4ARE13LynEm3YYTYUnomGXkC9 vjHCA9AACK5UgwrTibMvkSSYJTCMRYonYpcgasM3gt6mUHEgrolpC5PuYGR+ERe2Dp4z TCCq8Hiu8BRGFakrCpFL9UZSLBZ6uesCEn9Lhe7wcQKddddILrAl9x8IyYOnXevSqFKf T5X7XfLe83x6aJFYlTxHYGpm907spzD+kOmeHr/eTT6uGNciCHY+g7MzS7Uuafzi9u/T D4iLiIEAqKMFiZ5eHAIObVu3+jv2DQhJLvFszvmnzJvodzm7AMGOULW5q626f8Jzi/Yj l8Hw== X-Gm-Message-State: AO0yUKUc4ii5JZdZ57M4jZxpLj41pFqsDtLDoQvd9fnGMGP5VXclvPLx cBQI5kMQbypxMt+liCv2ltrAAP9wj9s= X-Google-Smtp-Source: AK7set/mHcitdOZxxuJ3Twt2GmvUKQLOLx6zpKUKqvU9rEDzxNkxnlbJK8plfTzvVtP9v4oXJBuFcQ== X-Received: by 2002:a05:6214:624:b0:5ba:168d:d3fc with SMTP id a4-20020a056214062400b005ba168dd3fcmr1641618qvx.4.1679362187004; Mon, 20 Mar 2023 18:29:47 -0700 (PDT) Received: from hurd (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id w2-20020ac87182000000b003b9a6d54b6csm7314698qto.59.2023.03.20.18.29.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 18:29:46 -0700 (PDT) From: Maxim Cournoyer References: Date: Mon, 20 Mar 2023 21:29:45 -0400 In-Reply-To: (Josselin Poiret's message of "Mon, 20 Mar 2023 23:26:36 +0100") Message-ID: <87pm923n92.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Josselin, Josselin Poiret writes: > * gnu/packages/firmware.scm (make-opensbi-package): Do it. Nitpick: The change log should state the change; it took me an instant to realize the "Do it" meant implement the git summary description. The summary can be more brief (or it could say the same if it fits under 80 chars). > gnu/packages/firmware.scm | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm > index 956ece5d6d..9b9443effe 100644 > --- a/gnu/packages/firmware.scm > +++ b/gnu/packages/firmware.scm > @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) > (native-inputs > `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) > (string-prefix? "riscv64" arch)) > - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) > + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) > ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) > '()))) > (arguments > @@ -499,6 +499,8 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) > `("CC=gcc")) > "FW_PAYLOAD=n" > "V=1") > + ;; fence.i instructions are used, so we need a non-default micro arch > + #:configure-flags (list "-march=rv64g") I don't quite understand, but then I don't know what is opensbi either, so I'd have to read more. Or if you can expound a bit that comment for neophytes like me, that'd be nice. Thanks for the fix! -- Maxim From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates 0/2] Fix qemu build Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 01:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167936233425380 (code B ref 62309); Tue, 21 Mar 2023 01:33:01 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 01:32:14 +0000 Received: from localhost ([127.0.0.1]:57198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQrF-0006bI-RQ for submit@debbugs.gnu.org; Mon, 20 Mar 2023 21:32:14 -0400 Received: from mail-qv1-f53.google.com ([209.85.219.53]:46625) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peQrD-0006b2-O1 for 62309@debbugs.gnu.org; Mon, 20 Mar 2023 21:32:12 -0400 Received: by mail-qv1-f53.google.com with SMTP id q88so2827907qvq.13 for <62309@debbugs.gnu.org>; Mon, 20 Mar 2023 18:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679362326; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=QvcwbpdLzcXgTuSSR5RsjlwymN3pW5ynY/rsF+apNkM=; b=fy8LLX4beH54Z5A7fvnyXBNOF/nSr5kuDsi6rh8Ws+SoYEONtK43iilZ/ngNKUWK11 WqeId8hPT33WFA6LxQ6FZ/rt3T1gr2nKY9Y22jhxcaHd+azGJLgsQKHPh5y9AUbt7vXx pBmmyydtOhggcskUzVGUNvy/pgYL14+rPIFvIzh8gawVrBeGJlYsDid/ZZgpd+59FrwK gNw5tAj5YwCdsejbZ/JjWZe+NKvzwQj+QTJb6iPUt11+CuCQEJP95PSuStreQsPiqlDW HXRY/WoWlkTXPTEkxTErZWRyrWxLZFVA2gJbCXb8OxcN4f6oMbWt9+IJc5oOzuN5E4iX aQZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679362326; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QvcwbpdLzcXgTuSSR5RsjlwymN3pW5ynY/rsF+apNkM=; b=bd22HYgrg1YUWDThWk94AXbWWXRsyuU4MQnN2Z34JsKbV8e+9XTTmcj9dVOhtjjLcH eHiN+PnpqoTYPMwVQqqKZkZNOzC8BLjKG2IsJwOdbYhPU0w8sLVj1bW6l/WzOOiPOfcc XhPIfg6qAAa++t5nVIs73zOIZnTP9QfecHLf5A4zRa+20GJc+7pmYozNJ5ulb+nJVptm IjkiLSwRwSvp9u/AoG4VwRgRTo6xP3rrX3urMg0C5dqajib/hrhOAHcm8P4xNblAd5KC 88en+2panj95Rq/2y2Lt2vLb3y8QFy0attlVHUCngoEEP5Ieg847Q3QlZXONyDlASL09 MQFQ== X-Gm-Message-State: AO0yUKUxA0l4q0/GHxYbYu57iprWSgYd5QAHE16iERmYaCcKVcxQjmlA mAmqRT0gtJUy0xSeHLUeFj+k2ZaTHqU= X-Google-Smtp-Source: AK7set+GdPEYuoeRZhSF4WmXYx2tVdan/cB+13FVZF2dQmaIIKoBwGhrbH+VQPlPuvX0j4eccJWJ7g== X-Received: by 2002:a05:6214:2587:b0:5ac:c5a1:7ced with SMTP id fq7-20020a056214258700b005acc5a17cedmr2129537qvb.0.1679362326013; Mon, 20 Mar 2023 18:32:06 -0700 (PDT) Received: from hurd (dsl-10-128-46.b2b2c.ca. [72.10.128.46]) by smtp.gmail.com with ESMTPSA id w8-20020a05620a148800b0073b27323c6dsm45244qkj.136.2023.03.20.18.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 18:32:05 -0700 (PDT) From: Maxim Cournoyer References: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> Date: Mon, 20 Mar 2023 21:32:03 -0400 In-Reply-To: <63a067a83bcb04fae466b42c818abef4859dfffc.1679350685.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Mon, 20 Mar 2023 23:26:37 +0100") Message-ID: <87lejq3n58.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Josselin Poiret writes: > * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/bootloaders.scm (u-boot): Apply patch. > --- > gnu/local.mk | 1 + > gnu/packages/bootloaders.scm | 3 ++ > .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ > 3 files changed, 39 insertions(+) > create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 058b23c683..20bf2bea77 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ > %D%/packages/patches/tuxpaint-stamps-path.patch \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ It probably doesn't matter too much, but the other lines use tabs to align the backslash, while your change uses spaces. > %D%/packages/patches/u-boot-infodocs-target.patch \ > %D%/packages/patches/u-boot-patman-guix-integration.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index ac269807be..457f3b3994 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -655,6 +655,9 @@ (define u-boot > %u-boot-allow-disabling-openssl-patch > %u-boot-sifive-prevent-relocating-initrd-fdt > %u-boot-rk3399-enable-emmc-phy-patch > + ;; FIXME The following patch is backported from 2023.01, > + ;; remove when updating. > + (search-patch "u-boot-fix-build-python-3.10.patch") > (search-patch "u-boot-infodocs-target.patch") > (search-patch "u-boot-patman-guix-integration.patch"))) > (method url-fetch) > diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch > new file mode 100644 > index 0000000000..27c03f92f4 > --- /dev/null > +++ b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch > @@ -0,0 +1,35 @@ > +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 > +From: Michal Suchanek > +Date: Thu, 13 Oct 2022 22:43:41 +0200 > +Subject: [PATCH] libfdt: Fix build with python 3.10 > + > +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in > +swig 4.10 but it is not clear when it will be released. There was a > +warning since python 3.8. > + > +Link: https://github.com/swig/swig/pull/2277 > + > +Signed-off-by: Michal Suchanek > +Reviewed-by: Simon Glass > +--- > + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ > + 1 file changed, 4 insertions(+) > + > +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped > +index 27c29ea260..56cc5d48f4 100644 > +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped > ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped > +@@ -7,6 +7,10 @@ > + > + %module libfdt > + > ++%begin %{ > ++#define PY_SSIZE_T_CLEAN > ++%} > ++ > + %include > + > + %{ > +-- > +GitLab > + The rest LGTM. -- Thanks, Maxim From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 0/2] Fix qemu build Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.16793891856138 (code B ref 62309); Tue, 21 Mar 2023 09:00:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 08:59:45 +0000 Received: from localhost ([127.0.0.1]:57605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqL-0001aw-BD for submit@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:45 -0400 Received: from jpoiret.xyz ([206.189.101.64]:35082) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqJ-0001ag-Fl for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:44 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id A14CA184D43; Tue, 21 Mar 2023 08:59:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679389182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LrOYB/SAE0IsNHG92N7rnaZk9vP9+ScE2bkVgsy1U/A=; b=QsjSD8VZPmd5I65ZT07lkKFvYkVcg80GTWA18Q1DSUIrtWziwhNVV8uTHlHzjHr4dttKJO 8+el/ItHv31OGwGRhalaVstMw/ht6qjZw9DFFdHyD8sxwehXDLbjeRiujGyUjPsKTWruzb ejDb5QTduSnkgVUQlvSoMnUKju5OvfB1Lv9yu9Vq4HMGq6FITLzxqLtRzMq7sjJFA8VcJf 8j/+ru4hZ4YlsWyYcQpbkue+b5uvaDr5GRHgPh7rU0CPfRgDZVMeRGA9eMqPcKWRXvAFLz aH7IIlJdQsP4+KFnQhFJN7vcfF1SEOVvJ6TQnpHzEnCK9H33zk/eeTPbJ2xLTQ== From: Josselin Poiret Date: Tue, 21 Mar 2023 09:59:35 +0100 Message-Id: In-Reply-To: <87pm923n92.fsf_-_@gmail.com> References: <87pm923n92.fsf_-_@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spamd-Bar: ++++ X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Maxim, Thanks for the review! Here's an updated patchset with the requested changes. To be honest, I don't think anyone would care about gnu/local.mk alignment, but that's a discussion for another time. By the way, I don't really know what opensbi is for either :) Best, Josselin Poiret (2): opensbi: Build with default gcc, with microarch rv64g u-boot: Fix build under Python 3.10. gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ gnu/packages/firmware.scm | 7 +++- .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 1/2] opensbi: Build with default gcc, with microarch rv64g Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 09:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.16793891896156 (code B ref 62309); Tue, 21 Mar 2023 09:00:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 08:59:49 +0000 Received: from localhost ([127.0.0.1]:57609 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqO-0001bD-Jw for submit@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]:35164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqK-0001ai-3Y for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:44 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 3208518530D; Tue, 21 Mar 2023 08:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679389183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8cPls61vPDAsDn4VgbkqTLUd6UZG7phXNRVjBBqz/EA=; b=n/OLgJffZSAVmHZgSDdSKNATxKmOXNAXbxiaWbYXy88RVaGS7rJ3ro8fu6YOWd/bb2JhFa 0abfIgt/AhG2jhl7pDYBEBC4nfXGAqiZTXPZkZ/eUAGX3neZVVzuAo0oCjZ9VEL/gD9ucA F8J5Yyk8APqAQj3OUAeEkQpxFRRa7cXuKdJNxOd/MMa2SqXFztcbx1o5IZISPAwg9fVgp1 Y/Jpd+LaYXDGbxjgHvjGjAhhz7oE5Lwaz3sM+VZoNkDW/2wdQyfsFE94VDWhRgmXSNm3Dw Q0Ycd9ylgNMQDoqpLGHob7C+ZN/4Mqg8f31xSs/sjKS3CuofBW2SsikSGINDIw== From: Josselin Poiret Date: Tue, 21 Mar 2023 09:59:36 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/firmware.scm (make-opensbi-package): Remove specific #:xgcc for the cross-toolchain, there is not reason for it now. Also set the microarch to rv64g, so that it builds. --- gnu/packages/firmware.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 956ece5d6d..0b7fff035a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) (native-inputs `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) (string-prefix? "riscv64" arch)) - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) '()))) (arguments @@ -499,6 +499,11 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) `("CC=gcc")) "FW_PAYLOAD=n" "V=1") + ;; Direct __asm__ is used with fence.i instructions, which are not + ;; available in the generic riscv ISA. We need a micro-arch with + ;; support for it, and rv64g is the official ISA with support for + ;; fence.i. + #:configure-flags (list "-march=rv64g") #:phases (modify-phases %standard-phases (delete 'configure) -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 09:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer , Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.16793891896162 (code B ref 62309); Tue, 21 Mar 2023 09:00:03 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 08:59:49 +0000 Received: from localhost ([127.0.0.1]:57611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqP-0001bF-05 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:49 -0400 Received: from jpoiret.xyz ([206.189.101.64]:35252) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peXqL-0001av-Gv for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 04:59:46 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 4262C184D43; Tue, 21 Mar 2023 08:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679389184; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EeTAa/8d248dqmpYxbBHTGfvbN1E1GMvOm3pRsrhpuY=; b=tkJ5tsVeqY63z9GLON9tt1J2CN296dAx+7tOcCXuvRF1Kcps442PFnN1KyF0mfHlSOtpFn 9u3p1eiQ8kMrr/pIoT6kwIVoSdXgpljHHcC5QAwyy+/k2wya7J84ulyA8sC+UsUARqp9cV /pIYdLgGe+CFq15aY1nCbaJOIpp5Kb7PYBPQYLT16d7k3mv6xjKBjWxc6QhgEntwYdIzp3 8hSHr63jQkeSDThv/xTSnBpP/1job/6Hold7OSEWwh11o2Mhg8YqaasyXVig/UkavUc7hc TOS2DDUAhumX17ArjfAb+nhWY/WUuzwQj5WfVOdZCYNFY3VdsBrX90wBE6xUCg== From: Josselin Poiret Date: Tue, 21 Mar 2023 09:59:37 +0100 Message-Id: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/bootloaders.scm (u-boot): Apply patch. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch diff --git a/gnu/local.mk b/gnu/local.mk index 058b23c683..73cf7b89a1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ %D%/packages/patches/tuxpaint-stamps-path.patch \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ %D%/packages/patches/u-boot-infodocs-target.patch \ %D%/packages/patches/u-boot-patman-guix-integration.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ac269807be..457f3b3994 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -655,6 +655,9 @@ (define u-boot %u-boot-allow-disabling-openssl-patch %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch + ;; FIXME The following patch is backported from 2023.01, + ;; remove when updating. + (search-patch "u-boot-fix-build-python-3.10.patch") (search-patch "u-boot-infodocs-target.patch") (search-patch "u-boot-patman-guix-integration.patch"))) (method url-fetch) diff --git a/gnu/packages/patches/u-boot-fix-build-python-3.10.patch b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch new file mode 100644 index 0000000000..27c03f92f4 --- /dev/null +++ b/gnu/packages/patches/u-boot-fix-build-python-3.10.patch @@ -0,0 +1,35 @@ +From 7d01bb1c5a1daef0187c9ea276bde19a8d0e7fde Mon Sep 17 00:00:00 2001 +From: Michal Suchanek +Date: Thu, 13 Oct 2022 22:43:41 +0200 +Subject: [PATCH] libfdt: Fix build with python 3.10 + +Python 3.10 requires defining PY_SSIZE_T_CLEAN. This will be fixed in +swig 4.10 but it is not clear when it will be released. There was a +warning since python 3.8. + +Link: https://github.com/swig/swig/pull/2277 + +Signed-off-by: Michal Suchanek +Reviewed-by: Simon Glass +--- + scripts/dtc/pylibfdt/libfdt.i_shipped | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/scripts/dtc/pylibfdt/libfdt.i_shipped b/scripts/dtc/pylibfdt/libfdt.i_shipped +index 27c29ea260..56cc5d48f4 100644 +--- a/scripts/dtc/pylibfdt/libfdt.i_shipped ++++ b/scripts/dtc/pylibfdt/libfdt.i_shipped +@@ -7,6 +7,10 @@ + + %module libfdt + ++%begin %{ ++#define PY_SSIZE_T_CLEAN ++%} ++ + %include + + %{ +-- +GitLab + -- 2.39.2 From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 1/2] opensbi: Build with default gcc, with microarch rv64g Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 16:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167941483526897 (code B ref 62309); Tue, 21 Mar 2023 16:08:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 16:07:15 +0000 Received: from localhost ([127.0.0.1]:60350 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeW3-0006zl-29 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 12:07:15 -0400 Received: from mail-yw1-f173.google.com ([209.85.128.173]:46912) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeW1-0006zX-2w for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 12:07:13 -0400 Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-544787916d9so288498727b3.13 for <62309@debbugs.gnu.org>; Tue, 21 Mar 2023 09:07:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679414827; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=d1leGjXmXJNg1eK0NXIBQyJpfvaPZXdmH21p3X0IWRA=; b=bXNtt9ijBVokV4KzFP4O0etQ3F59BFl4LTGAvZUMZp+0CBM5T4Ie0SbpLO4rTRgt+4 JnrmHuJ5Gm5dcJba46iOWb+tcnty6KxRiyVR8oVt/yy9ufBjTH0Cy3PA9stvs09NJj3X BnW+b0xTy9a+Vs99cxj2eIIhknvvxipmnYDbBJ3TjuHGb2G+qq+ntA3jIBbKNy5srrlB vOyj00Xf/dHxfBhyFUay8TEpW/+U6Th3I/YABUWYrqBUbV/AG4nLPE2dj6XJWiw303O7 I3/Jt/ENuZsMNvk9E3tEcvOTc4mH3UNoyxgEUj2nB2MxzyM2hDPO7VgpPHo4Tk3UzpaN qbZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679414827; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=d1leGjXmXJNg1eK0NXIBQyJpfvaPZXdmH21p3X0IWRA=; b=FpuGGarBGpGwkhGNgmC+EAC4Bs9JGCBwna66pJJxAniDxrqmv/zbt6UVzI7Kjo0Y0Q zbb77zr8OTPBEpljfoGNgEW4YkIDIattej0XN4nrJtkKAUetFXTwZbAoFA2fFga79oie 5/fUfFn9dzxqZ1kHrnBZKHA4wK65VvLlHY0s+rmNBGJ6FoaUCDJL0A1kHl2RpQ9pcvnP z7b+WubFNkcomtFgQJfrMooU/A1OSqlee0QJnQoGRhPJmxe+VkPhO7fkvEc9MOb6z7Gp RS5nhRwUtzBqcEzGFGUk2AUl5cwO6fOhBN2P7MydI0a+dM+t0o1f/H/+rCN0Bt/5otxd 1crg== X-Gm-Message-State: AAQBX9fYp+HPVROLQ6XeQLr9Qq+qmbFf1+C85lw5AAg7A8/bhpMb0wOL qi0aU5nOJKeKP5uwpJxHHmiWv1QfH0eIYg== X-Google-Smtp-Source: AKy350ZR6e5OQhkDW8vHKMr9/kuJ0gM7UZhiN0mLIddX/bOLQG3sPlSRplQ1/SW9H9oa4M4xI29E+A== X-Received: by 2002:a81:6954:0:b0:536:cafd:7ef with SMTP id e81-20020a816954000000b00536cafd07efmr1997355ywc.36.1679414827345; Tue, 21 Mar 2023 09:07:07 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1004]) by smtp.gmail.com with ESMTPSA id 123-20020a370581000000b007456df35859sm5145122qkf.74.2023.03.21.09.07.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 09:07:07 -0700 (PDT) From: Maxim Cournoyer References: Date: Tue, 21 Mar 2023 12:07:05 -0400 In-Reply-To: (Josselin Poiret's message of "Tue, 21 Mar 2023 09:59:36 +0100") Message-ID: <874jqeozpy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello! Josselin Poiret writes: > * gnu/packages/firmware.scm (make-opensbi-package): Remove specific #:xgcc for > the cross-toolchain, there is not reason for it now. Also set the microarch to > rv64g, so that it builds. > --- > gnu/packages/firmware.scm | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm > index 956ece5d6d..0b7fff035a 100644 > --- a/gnu/packages/firmware.scm > +++ b/gnu/packages/firmware.scm > @@ -486,7 +486,7 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) > (native-inputs > `(,@(if (and (not (string-prefix? "riscv64" (%current-system))) > (string-prefix? "riscv64" arch)) > - `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu" #:xgcc gcc-7)) > + `(("cross-gcc" ,(cross-gcc "riscv64-linux-gnu")) > ("cross-binutils" ,(cross-binutils "riscv64-linux-gnu"))) > '()))) > (arguments > @@ -499,6 +499,11 @@ (define* (make-opensbi-package platform name #:optional (arch "riscv64")) > `("CC=gcc")) > "FW_PAYLOAD=n" > "V=1") > + ;; Direct __asm__ is used with fence.i instructions, which are not > + ;; available in the generic riscv ISA. We need a micro-arch with > + ;; support for it, and rv64g is the official ISA with support for > + ;; fence.i. > + #:configure-flags (list "-march=rv64g") > #:phases > (modify-phases %standard-phases > (delete 'configure) LGTM, thanks for expounding the comment as suggested! -- Thanks, Maxim From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 16:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167941530027623 (code B ref 62309); Tue, 21 Mar 2023 16:15:02 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 16:15:00 +0000 Received: from localhost ([127.0.0.1]:60360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peedX-0007BT-Ou for submit@debbugs.gnu.org; Tue, 21 Mar 2023 12:15:00 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:35600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peedW-0007BH-Oh for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 12:14:59 -0400 Received: by mail-qt1-f180.google.com with SMTP id ay22so7139900qtb.2 for <62309@debbugs.gnu.org>; Tue, 21 Mar 2023 09:14:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679415293; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=2EhnJcRV4SwsGg3rGtVxpqHDBNV0g0nb+uD0qJ5B5GM=; b=GULM9C26sxZAnlfXSP7ZickD013pdZw5yWtOYDKqQP8X/ogPka0KJ7wFhTc+T1EIK8 Nd+dsHieK8zIgt0uAZ8E1AC8S4JcAH2oXteedNCaAYX8KnkAN0zlLEkoT4rbyj5y8w6N 4rrXHY7OVBE5wSRt9tCbsKt4M7BvnqwTB6y7pzqTQaT1TZbvEG7W+NByx1W/UNK7E72q fm8SryFnnKTCG2JJz5h4ccIs5gpm50iS94kCh1qZaikKsW9z0oidNo5eeZW4Kign8Au4 CzMM70Au5Xl0fAXhiQbS8cS7gnS58eFJlP8+ULAchTYR5DVKpuW7w3GBwtXdT3JPLqHF rG+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679415293; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=2EhnJcRV4SwsGg3rGtVxpqHDBNV0g0nb+uD0qJ5B5GM=; b=erLQLuhiKTVjCN9qcwgZq8fFTdMRw2sCedmA0C6rvN/mgSDhjvSRfVmng86egGo0zk HFXk6edg9sO3CxIglCR25/YTXJjnvQaNM9ybXia3x4ICbFYxwespzxD31NkqATqxN3xb JHgETh/67pm2IpNSwquuLRYPN4JtrmmbK4CHWAnszItQQtiVzcwIFDW1RRSQaQ+TLMdf DmzR4EbV9nzC/Esel7yFj8t8KHEpG9eMr/35mJ+kQIpTUj/FtL0Xs48dmNDW+2iyQjJY DjhiPTM5pG8keKPsoV/hA2Q9NQg3Zh3Gd/uyT35vIn6a7PlC0dQaV91tQiR9ICw02WVl vScg== X-Gm-Message-State: AO0yUKWa2gtS3AE7XrygCrY/04pqBW/cx19ODoTBvWJG5TyWh8rEhFhj j73S3kIwiUWxylNmRF4Y5HE1MxgqHZwJMA== X-Google-Smtp-Source: AK7set/BLXZZbwiZoLbvlNEiED4H58Tf2Go8BlVRbSY9SS9zU45d7tBzD3ICDR4AulQeaqcMTu4ZfA== X-Received: by 2002:ac8:5813:0:b0:3d6:dca:f0df with SMTP id g19-20020ac85813000000b003d60dcaf0dfmr588794qtg.66.1679415292757; Tue, 21 Mar 2023 09:14:52 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1004]) by smtp.gmail.com with ESMTPSA id 69-20020a370c48000000b00746777fd176sm3145429qkm.26.2023.03.21.09.14.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 09:14:52 -0700 (PDT) From: Maxim Cournoyer References: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> Date: Tue, 21 Mar 2023 12:14:50 -0400 In-Reply-To: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> (Josselin Poiret's message of "Tue, 21 Mar 2023 09:59:37 +0100") Message-ID: <87zg86nksl.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Josselin, Josselin Poiret writes: > * gnu/packages/patches/u-boot-fix-build-python-3.10.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/bootloaders.scm (u-boot): Apply patch. > --- > gnu/local.mk | 1 + > gnu/packages/bootloaders.scm | 3 ++ > .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ > 3 files changed, 39 insertions(+) > create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 058b23c683..73cf7b89a1 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -1936,6 +1936,7 @@ dist_patch_DATA = \ > %D%/packages/patches/tuxpaint-stamps-path.patch \ > %D%/packages/patches/twinkle-bcg729.patch \ > %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ > + %D%/packages/patches/u-boot-fix-build-python-3.10.patch \ > %D%/packages/patches/u-boot-infodocs-target.patch \ > %D%/packages/patches/u-boot-patman-guix-integration.patch \ > %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ > diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm > index ac269807be..457f3b3994 100644 > --- a/gnu/packages/bootloaders.scm > +++ b/gnu/packages/bootloaders.scm > @@ -655,6 +655,9 @@ (define u-boot > %u-boot-allow-disabling-openssl-patch > %u-boot-sifive-prevent-relocating-initrd-fdt > %u-boot-rk3399-enable-emmc-phy-patch > + ;; FIXME The following patch is backported from 2023.01, > + ;; remove when updating. FIXME and other similar comment prefixes are more conventionally used with a colon (FIXME: ...), I think. I also prefer to keep the patch origin tracking in the patch itself (and 'guix lint' checks for that nowadays, at least in some cases). The patch should fail to apply when after it's included in a release. Feel free to push with these suggested changes. -- Thanks, Maxim From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 18:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167942357318752 (code B ref 62309); Tue, 21 Mar 2023 18:33:01 +0000 Received: (at 62309) by debbugs.gnu.org; 21 Mar 2023 18:32:53 +0000 Received: from localhost ([127.0.0.1]:60578 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pegmy-0004sN-K8 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 14:32:52 -0400 Received: from jpoiret.xyz ([206.189.101.64]:48266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pegmw-0004sC-4g for 62309@debbugs.gnu.org; Tue, 21 Mar 2023 14:32:51 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id AE8FE185310; Tue, 21 Mar 2023 18:32:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679423568; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=lsUinGimS5w//s6CClWFPVqHAOBiiANvndl/dHG722s=; b=mM5DTv/H8RcnUilIHvmpjxJjkBBcF8PCGW9oHhR8onQZPt9EXAVkzKTkQj9k12qWagSARm kEDCQPhf9wKHcmPV98knmKwfiTC0t8j0zBNFRINbU4bHQrsxSEspl/K0mCvZ5AHjahv9bI 0RhGImN8VUhqu7atkEymjspkEK6Fzs59ffqQ0kG0Ic4lVucWpaZIG7ZaV72BUbWnufVbbU lOKzGINo1E6yGYhOzKt/7PUR++O0cU6Ekn9vqnmK9V+jrjFn1DvJhoRkzpI16oGZnWu91D pFZOQHp4/Hvz7YXINM8m0WmpevYSx7Wy4jmm8dy1QNhn+9l4a+m7cMZRYZ8Itw== From: Josselin Poiret In-Reply-To: <87zg86nksl.fsf@gmail.com> References: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> <87zg86nksl.fsf@gmail.com> Date: Tue, 21 Mar 2023 19:32:43 +0100 Message-ID: <87zg86q7jo.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hi Maxim, Maxim Cournoyer writes: > FIXME and other similar comment prefixes are more conventionally used > with a colon (FIXME: ...), I think. I also prefer to keep the patch > origin tracking in the patch itself (and 'guix lint' checks for that > nowadays, at least in some cases). The patch should fail to apply when > after it's included in a release. Right, I added this FIXME in the heat of the moment. I don't really mind either way, although I find it nice that when it fails to apply, anyone can see this comment and conclude that it should be ok to remove (as opposed to some patches failing because they're not up to date). What do you mean by "patch origin tracking", and it being taken care of by `guix lint`? > Feel free to push with these suggested changes. I don't know if this was directed at me or committers, but I'll just add that I do not have commit rights, if anyone else wants to have a look and push :) Best, =2D-=20 Josselin Poiret --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQHEBAEBCAAuFiEEOSSM2EHGPMM23K8vUF5AuRYXGooFAmQZ+EsQHGRldkBqcG9p cmV0Lnh5egAKCRBQXkC5FhcaivcoC/kBVQSdlRYUm2pM1KY4y7uPKfjnLbAH/Nry gmhmJQKKPY5VLUsw68pzFRDAoMCyxEXw7Qhyu3//j3S8WE9jGKy/9GUWUlRlq5PX aGps4xcPfkCDonSd7cX9avEH4lGwZEpL9uCf3DpBtLSPCYtB8xDOBP5w0KUqYh6C 86DOV+KSVuedGJHSGEzddDXaxc5PeK9+GI3UxAH9jaAaKWlAF6FtGLd6bXRrece6 86VR1Ml6bY8SSWjgCSBdA48WKDVx6d58MkWOD41Or6aT5URTMYgbdGhXpfa8zMRq EZFCdSPSRRVEOMvz9GsZ8BBJ6mt8Sjh9g4hpspV5Qh5xYqPaCfzjzHvUWZ+TbSj5 kyi1kWA8/Mq/qc7196eOfvmsazCEYB60gYndHzpDdCFZFnkcJKsxV7VhJP+sHVRZ /EaEnAODXiSPZft3N/4kUGQnKQP9giHqEDQ1L6h61uSsz37lQdPICecK0dNJPHT5 VZgT14+M5sdatAiHTugQmk1OmCcr8kI= =bKxN -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Aug 16 19:16:17 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#62309] [PATCH core-updates v2 2/2] u-boot: Fix build under Python 3.10. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 18:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62309 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Josselin Poiret Cc: 62309@debbugs.gnu.org Received: via spool by 62309-submit@debbugs.gnu.org id=B62309.167950944531678 (code B ref 62309); Wed, 22 Mar 2023 18:25:02 +0000 Received: (at 62309) by debbugs.gnu.org; 22 Mar 2023 18:24:05 +0000 Received: from localhost ([127.0.0.1]:36710 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf381-0008Es-Ck for submit@debbugs.gnu.org; Wed, 22 Mar 2023 14:24:05 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:38818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pf37z-0008EM-Rr for 62309@debbugs.gnu.org; Wed, 22 Mar 2023 14:24:04 -0400 Received: by mail-qt1-f176.google.com with SMTP id w25so1234343qtc.5 for <62309@debbugs.gnu.org>; Wed, 22 Mar 2023 11:24:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679509438; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=EIgNWgGzf1+cBM+t7LXLwqeQumvJ40Ml98tjfVszLGM=; b=Ak9QXJ7nfFIsGrEdMdpToX6/JB+GhnaOuFdFr1HjqIl4DhvhxpFKhGGO//kDK/VRwC +kFlO3xBsceWY0djADRxRkzrxBm0vHJJNFX9QunvCO/SwNdp5+EGLLnt14RYqpwT23Pw Jp8F0NLn8eCkMib4MIFIOG/BzD6gOKAmmNLb5qcLt6Ubp0dXtHobYuVX1YcyFYq6jjwA UKAxPUTkCkhb1r28BDA+3qI8UjBCk8CK76JY4Rid7RQQrBaKyZ3xkTTCW2G2yflgi9yo FG3c1rFjyJxSAjaopeiy1NB9ErOCMXKoE6hk9QtEUm/z5Z0FPyDSMBFm0DkhJcFkjmCD WgZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679509438; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=EIgNWgGzf1+cBM+t7LXLwqeQumvJ40Ml98tjfVszLGM=; b=BEybotkNG4jrcEa8a++jKJeQlW7k7JRXvAduoNqyoVZfqaHdVpz6FMnkeztyg0PP99 DTjusc3OeR2f975SCkilOXFHpN4XgT8bKosabTMBRzj4ZruvFdkxcKOEWcATT9w2bFBO SijQaXEFAwY2Vxkq6QbcODZV83zly17XcDkbd0oGAGkRhy9k+go/lwW5zS7xmdrbZ5ib FKMtkFPSD/4z+Sny75qbDLp8dZ0gcWCNpdQAg0nkL3yq/4HyAUbuab95aiTNuKShl7zu F18vtsSjy781bBSmySrRmzvRTWtpzJQLwHMte7EMgxBAAgd55I/8fDpFT0v4BGTLBPSg wNXg== X-Gm-Message-State: AO0yUKUWBJWj37sD75XnGYc5ui1oozhF+uW3riQjAK1jWIRrYxEb1VWZ BjU0OzirQSN8OBmt9TliNlbFLX9C2DYmkQ== X-Google-Smtp-Source: AK7set+dKyKeRft+YHKzNnP1mOjTtbJ+gFUZ0uNdEv0XsDjb4zWHlaDOfveJ0XjQzWHlij2HATj1eA== X-Received: by 2002:a05:622a:1ba6:b0:3a8:e35:258f with SMTP id bp38-20020a05622a1ba600b003a80e35258fmr7250962qtb.31.1679509438228; Wed, 22 Mar 2023 11:23:58 -0700 (PDT) Received: from hurd ([2607:fad8:4:3::1001]) by smtp.gmail.com with ESMTPSA id h13-20020ac8744d000000b003e248cc2986sm5366298qtr.43.2023.03.22.11.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 11:23:57 -0700 (PDT) From: Maxim Cournoyer References: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> <87zg86nksl.fsf@gmail.com> <87zg86q7jo.fsf@jpoiret.xyz> Date: Wed, 22 Mar 2023 14:23:56 -0400 In-Reply-To: <87zg86q7jo.fsf@jpoiret.xyz> (Josselin Poiret's message of "Tue, 21 Mar 2023 19:32:43 +0100") Message-ID: <87v8isfxvn.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Josselin Poiret writes: > Hi Maxim, > > Maxim Cournoyer writes: > >> FIXME and other similar comment prefixes are more conventionally used >> with a colon (FIXME: ...), I think. I also prefer to keep the patch >> origin tracking in the patch itself (and 'guix lint' checks for that >> nowadays, at least in some cases). The patch should fail to apply when >> after it's included in a release. > > Right, I added this FIXME in the heat of the moment. I don't really > mind either way, although I find it nice that when it fails to apply, > anyone can see this comment and conclude that it should be ok to remove > (as opposed to some patches failing because they're not up to date). > What do you mean by "patch origin tracking", and it being taken care of > by `guix lint`? > >> Feel free to push with these suggested changes. > > I don't know if this was directed at me or committers, but I'll just add > that I do not have commit rights, if anyone else wants to have a look > and push :) It was directed at you, I thought you already had commit rights :-). -- Thanks, Maxim From unknown Sat Aug 16 19:16:17 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Josselin Poiret Subject: bug#62309: closed (Re: bug#62309: [PATCH core-updates 0/2] Fix qemu build) Message-ID: References: <87edpbb6hu.fsf_-_@gnu.org> X-Gnu-PR-Message: they-closed 62309 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 62309@debbugs.gnu.org Date: Sun, 26 Mar 2023 20:31:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1679862662-23159-1" This is a multi-part message in MIME format... ------------=_1679862662-23159-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #62309: [PATCH core-updates 0/2] Fix qemu build which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 62309@debbugs.gnu.org. --=20 62309: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D62309 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1679862662-23159-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 62309-done) by debbugs.gnu.org; 26 Mar 2023 20:30:36 +0000 Received: from localhost ([127.0.0.1]:45957 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgX0d-00060r-Nx for submit@debbugs.gnu.org; Sun, 26 Mar 2023 16:30:35 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pgX0b-00060b-JN for 62309-done@debbugs.gnu.org; Sun, 26 Mar 2023 16:30:34 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgX0V-0007Cr-SG; Sun, 26 Mar 2023 16:30:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=9+f+pW0AiHN4tjydziwFW8C07QF4YChaBhLElMGHqA4=; b=hB7sFkdKlOIiarifikgv odNXZZ5dLWgyVKDwvoPKedtOz3DYbyLpLXHLTf9F7rBJWvDiqnqOkLXEuUv5bNpy82rcKKNgfvSpp ZE7PZt9Fj9mDJbfEYxLVTZnW2Dda5KOxX/s5r0YSrsVfcrUQNhR5HHHJYsEO0nz6ZQFUWnRm36b9q SypB9Roo0HTxndbcD9hRfEh5enO4h01+WtDZ7DGSiX7HyQi+UwLChjw96gzkKxXTRTMr6bfo4GdUk TlQH+38d7SR89BZlerVmGtXZdyyOtXrMJ+UpxYRqKZYUItbJi8RONd0EbKXd0OsIKYg+HaA6BY2Yf udjkcHU7YAjcHA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pgX0S-00044t-KJ; Sun, 26 Mar 2023 16:30:27 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Josselin Poiret Subject: Re: bug#62309: [PATCH core-updates 0/2] Fix qemu build References: <1896443a4ab3038fdbd1077a625178eeae1f737b.1679389017.git.dev@jpoiret.xyz> <87zg86nksl.fsf@gmail.com> Date: Sun, 26 Mar 2023 22:30:21 +0200 In-Reply-To: <87zg86nksl.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 21 Mar 2023 12:14:50 -0400") Message-ID: <87edpbb6hu.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 62309-done Cc: Maxim Cournoyer , 62309-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Pushed both patches as 68793b702e4295d011c89e72826fd15ce18e0b95, with the cosmetic changes Maxim proposed. Thanks! Ludo=E2=80=99. ------------=_1679862662-23159-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Mar 2023 22:23:51 +0000 Received: from localhost ([127.0.0.1]:57074 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNuw-0007lG-My for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:23:50 -0400 Received: from lists.gnu.org ([209.51.188.17]:60380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peNuv-0007l8-24 for submit@debbugs.gnu.org; Mon, 20 Mar 2023 18:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNuu-0008Sq-JQ for guix-patches@gnu.org; Mon, 20 Mar 2023 18:23:48 -0400 Received: from jpoiret.xyz ([206.189.101.64]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peNus-0007NW-Vh for guix-patches@gnu.org; Mon, 20 Mar 2023 18:23:48 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 7E26A184D6B; Mon, 20 Mar 2023 22:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1679351024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XVjv7VHYmxrb8k+z31dTDiKie4QBqfxiNZ3Ff/Hmzt8=; b=h+MUM0cQaaGMbhxbn+tDsEN+5N6dG4CS7p8XU69wgVrNbJVtABRarVZnvA+JPShD12AC/A PlCQs8lZJ2513m7ArJDtm1eQFsfwXPbO84XLw3jtfhLMdFjyPsYwyio/bA7bQUo1gofdKq JEWYoJDbHQv2xa/tVTVXQA/KfF7DnNkWuk/KardafC4CW3DpL2VbwvTKtUbsVpqp8EzffL DJeGxGf9l23y+6x5viKIvWo7maKuPvABYnnUW1wS4VYg4x841N73n/6BrRv2tdj4E3jqNn d+Vo0lo3jJza3pU0tdDTR/gJWuWdb5oUaMaGUCjo0LNgfedrO3eRMDQDMGN9DA== From: Josselin Poiret To: guix-patches@gnu.org Subject: [PATCH core-updates 0/2] Fix qemu build Date: Mon, 20 Mar 2023 23:23:38 +0100 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Authentication-Results: jpoiret.xyz; auth=pass smtp.auth=jpoiret@jpoiret.xyz smtp.mailfrom=dev@jpoiret.xyz X-Spam-Level: **** X-Spamd-Bar: ++++ Received-SPF: pass client-ip=206.189.101.64; envelope-from=dev@jpoiret.xyz; helo=jpoiret.xyz X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: Josselin Poiret X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hi, Quick patches to fix some dependencies of QEMU that didn't build on my side! Best, Josselin Poiret (2): opensbi: Build with default gcc, with microarch rv64g u-boot: Fix build under Python 3.10. gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 3 ++ gnu/packages/firmware.scm | 4 ++- .../u-boot-fix-build-python-3.10.patch | 35 +++++++++++++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-fix-build-python-3.10.patch -- 2.39.2 ------------=_1679862662-23159-1--