From patchwork Fri Dec 1 19:48:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 57178 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 525CC27BBE9; Fri, 1 Dec 2023 19:50:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7F32527BBE2 for ; Fri, 1 Dec 2023 19:50:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r99WV-0007GC-13; Fri, 01 Dec 2023 14:50:03 -0500 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 1r99WM-0007Br-Pr for guix-patches@gnu.org; Fri, 01 Dec 2023 14:49:54 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r99WM-0000zx-4r for guix-patches@gnu.org; Fri, 01 Dec 2023 14:49:54 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r99WU-0008Bj-Iu for guix-patches@gnu.org; Fri, 01 Dec 2023 14:50:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67261] [PATCH v2] gnu: u-boot: Update to 2023.10. Resent-From: Vagrant Cascadian Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 01 Dec 2023 19:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67261 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Herman Rimm , 67261@debbugs.gnu.org Cc: Maxim Cournoyer , Munyoki Kilyungi , Lars-Dominik Braun , Efraim Flashner , jgart@dismail.de, Marius Bakke Received: via spool by 67261-submit@debbugs.gnu.org id=B67261.170146016231424 (code B ref 67261); Fri, 01 Dec 2023 19:50:02 +0000 Received: (at 67261) by debbugs.gnu.org; 1 Dec 2023 19:49:22 +0000 Received: from localhost ([127.0.0.1]:56109 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r99Vq-0008Am-6V for submit@debbugs.gnu.org; Fri, 01 Dec 2023 14:49:22 -0500 Received: from cascadia.aikidev.net ([2600:3c01:e000:267:0:a171:de7:c]:53318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r99Vl-0008AW-IS for 67261@debbugs.gnu.org; Fri, 01 Dec 2023 14:49:21 -0500 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@cascadia.debian.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id 9F9151AA80; Fri, 1 Dec 2023 11:48:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1701460139; bh=UxJCjO5zEkViXNiShxdGpH5depjokZbemI3o5hSLdh8=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=NaYaRnbtC0Kxc1XT8zEXj9ATsomOQ7DvChVnJXEJQbMhNKByHaXEOIth1FTus3ic3 9KxZDu5KjvGc1H8bT/4o17p5a+w4eAOQGbWufYW7xKpQPoykeu51Sw4V3fvu//dEln JiA/Tp/kuaY2uRH/ZPgIkk5EA66hGyVw1TAU+gH4c3ONgKMqZZa2h9YBQ9gJGe2CWE 6boWHjOY9hYzg5DGtshLYsjxi0obxuASH/OSiCVOysUCA6dKSxD0TIez7igJeoNrdt LGDtaq8HCX2+tXpwxTi4bPqqm4wVcf2wNza7ep5ehk7jcrwvNEQMd1FjwnOewoEkcJ KDoOAp/xDbQxQ== From: Vagrant Cascadian In-Reply-To: <84197f2f58280985be25675aaf7e06fa3309c2cf.1701072816.git.herman@rimm.ee> References: <84197f2f58280985be25675aaf7e06fa3309c2cf.1701072816.git.herman@rimm.ee> Date: Fri, 01 Dec 2023 11:48:55 -0800 Message-ID: <875y1hln4o.fsf@wireframe> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches On 2023-11-27, Herman Rimm wrote: > If you would like to test u-boot v2023.10 and have a HiFive Unmatched, > please test this revision of the patch and let me know whether or not > the device still boots. Will check booting an unmatched board; I need to do the same test to upgrade u-boot in Debian anyways. The main outstanding issue is that u-boot-documentation still fails to build. In order to get u-boot-documentation to build, I had to add python-sphinx-prompt, and in order to get python-sphinx-prompt to build, I needed to disable tests. Can someone from the python team take a look at python-sphinx-prompt? python-sphinx-rtd-theme is an optional dependency for the documentation, but it does build without it. I am not sure how much nicer it is with or without it. Any opinions on enabling that or using the default theme? Applying this patch on top of v2 gets everything building for me, though obviously disabling tests for python-sphinx-prompt is not ideal: live well, vagrant diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 5e6edb143e..1b5e745fce 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -764,6 +764,8 @@ (define-public u-boot-documentation (modify-inputs (package-native-inputs u-boot) (append fontconfig python-sphinx + python-sphinx-prompt + ; python-sphinx-rtd-theme texinfo which))) (synopsis "U-Boot documentation") diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index eee1f1c4a8..020e0794ef 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -637,7 +637,8 @@ (define-public python-sphinx-prompt (base32 "0x9wmgf04rzivbzp7jv1b7fkhkpi02lpk5w1qf4i7bcgih00ym8a")))) (build-system python-build-system) (arguments - `(#:phases + `(#:tests? #f ; FIXME build fails without this, needed to build u-boot-documentation 2023.10+ + #:phases (modify-phases %standard-phases (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys)