From patchwork Sat Jul 8 04:03:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 51633 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 5D7D027BBE9; Sat, 8 Jul 2023 05:04:39 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED 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 D9A2027BBE2 for ; Sat, 8 Jul 2023 05:04:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHzAy-00022g-CJ; Sat, 08 Jul 2023 00:04:04 -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 1qHzAx-000229-35 for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHzAw-00064K-OU for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHzAw-0000aB-DS for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH 1/2] gnu: Add python-u-boot-pylib. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 04:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Vagrant Cascadian Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il, Maxim Cournoyer Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.16887890342211 (code B ref 64149); Sat, 08 Jul 2023 04:04:02 +0000 Received: (at 64149) by debbugs.gnu.org; 8 Jul 2023 04:03:54 +0000 Received: from localhost ([127.0.0.1]:44000 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzAn-0000ZZ-HK for submit@debbugs.gnu.org; Sat, 08 Jul 2023 00:03:53 -0400 Received: from mail-qk1-f169.google.com ([209.85.222.169]:60632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzAj-0000Z9-KI for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 00:03:51 -0400 Received: by mail-qk1-f169.google.com with SMTP id af79cd13be357-7659dc74d91so259240985a.0 for <64149@debbugs.gnu.org>; Fri, 07 Jul 2023 21:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688789024; x=1691381024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WvbetOAYfwagtNj2A8uAC7fpOMdxLrA3szBiuba92Pg=; b=SBxV81TVTLs2kvXGaVgoU06whZXbfVphrU/WmQtr+0jBjQ4i6gdupr1dTuO65awJC+ Va3P6sX3dV13DzKOz1v5Z/7D+Wl6rAw6KUT097sGjTz8z+TXGGdFh4BhLCRzBcV3b2h9 lZ63LkzkTz/ZcDfZWFN8CYmwUwgfUWi3Xwfh7QduVKd2r0hxc5s3vH0K/t0YYM5V7L1S 2qeFRxrMHtJ97Fx7RN0EkL5WRIMyUU53HQ+tUZp/kAidZyLj27LFUJ8C8CwgmITs2cBZ O0r3kcS1JSsDeF75tle/cNUCOsJXBr2z5zg5aAeCi7RGsa6RjglnJ+YHWwI0AcjibeGV ruZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688789024; x=1691381024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WvbetOAYfwagtNj2A8uAC7fpOMdxLrA3szBiuba92Pg=; b=jex4KYRYzKlKsb80oPSpDIwoxYzV0CpN07E/HYBwqPcyCKBE0KqS0mA4pfcf5xa4Eb pJwdAGg3yP1R8fbOYd30e6lq0do1eNm4EVl321CnL2yu8bzi55G0KMmk969ToFP22SIc /ZQq8elIV0cGCBVmCbmNazOHM4Py0VKC/g0/Zgvl/MYMkvhCa6R0iC1ECQ2MLJ9lcVDv DytlNrTyaSC6sEQsQkAhaGhxSnImjeGuRNUSgbnW6u4b8v9Htui2KLaycJ27rxa+5xAh wpAxH54V116XsPQMbSiPt33LCn4CBFaqtkVfEt6GTOnHxoxPRxqbge6Y8feT4EJZ0fpa V2Sw== X-Gm-Message-State: ABy/qLbEZHnScEC1opLoY41EyH8kGZ29jWtBF+E2Z/Etb3j0M9EkAmGn nNc1QNguegXnK07W7aHf36h7bjaLEoc= X-Google-Smtp-Source: APBJJlHoJu489FdkQ9zRumr+gD0KNPleGKIEEbFreZZ5+it99vGX5MpxRe+jgJZynzPSrzJ7Y5t0hg== X-Received: by 2002:a05:622a:205:b0:3fe:3074:64bc with SMTP id b5-20020a05622a020500b003fe307464bcmr9643471qtx.10.1688789024023; Fri, 07 Jul 2023 21:03:44 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-179.b2b2c.ca. [205.236.230.179]) by smtp.gmail.com with ESMTPSA id c4-20020ac80084000000b003f3937c16c4sm2457264qtg.5.2023.07.07.21.03.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 21:03:43 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 8 Jul 2023 00:03:17 -0400 Message-Id: <930d43aa16eee3ca8a9350ec8f24bc596aea159c.1688788818.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <87edllgc9u.fsf@wireframe> References: <87edllgc9u.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 * gnu/packages/bootloaders.scm (python-u-boot-pylib): New variable. * gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 23 +++++++++++++++++- .../patches/u-boot-fix-u-boot-lib-build.patch | 24 +++++++++++++++++++ 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch diff --git a/gnu/local.mk b/gnu/local.mk index bb13280dc7..c12b29447d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1996,6 +1996,7 @@ dist_patch_DATA = \ %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-fix-u-boot-lib-build.patch \ %D%/packages/patches/u-boot-nintendo-nes-serial.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-sifive-prevent-reloc-initrd-fdt.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 3f04411f1b..c1a76ab90e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -655,7 +655,8 @@ (define u-boot %u-boot-allow-disabling-openssl-patch %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch - (search-patch "u-boot-fix-build-python-3.10.patch"))) + (search-patch "u-boot-fix-build-python-3.10.patch") + (search-patch "u-boot-fix-u-boot-lib-build.patch"))) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" @@ -831,6 +832,26 @@ (define-public u-boot-tools " This package provides board-independent tools " "of U-Boot.")))) +(define-public python-u-boot-pylib + (package + (inherit u-boot) + (name "python-u-boot-pylib") + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "tools/u_boot_pylib"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "./u_boot_pylib"))))))) + (synopsis "U-Boot Python library") + (description "This package provides common Python code used by some of the +commands part of the U-Boot project, such as Patman."))) + ;;; This is packaged separately, as it can be used in other contexts than for ;;; U-Boot development. (define-public patman diff --git a/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch new file mode 100644 index 0000000000..233c437de6 --- /dev/null +++ b/gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch @@ -0,0 +1,24 @@ +Submitted upstream (see: +https://lists.denx.de/pipermail/u-boot/2023-July/521984.html) + +diff --git a/tools/u_boot_pylib/pyproject.toml b/tools/u_boot_pylib/pyproject.toml +index 3f33caf6f8..037c5d629e 100644 +--- a/tools/u_boot_pylib/pyproject.toml ++++ b/tools/u_boot_pylib/pyproject.toml +@@ -9,7 +9,7 @@ authors = [ + { name="Simon Glass", email="sjg@chromium.org" }, + ] + description = "U-Boot python library" +-readme = "README.md" ++readme = "README.rst" + requires-python = ">=3.7" + classifiers = [ + "Programming Language :: Python :: 3", +@@ -20,3 +20,7 @@ classifiers = [ + [project.urls] + "Homepage" = "https://u-boot.readthedocs.io" + "Bug Tracker" = "https://source.denx.de/groups/u-boot/-/issues" ++ ++[tool.setuptools.packages.find] ++where = [".."] ++include = ["u_boot_pylib*"] From patchwork Sat Jul 8 04:03:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 51632 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 756D227BBEA; Sat, 8 Jul 2023 05:04:32 +0100 (BST) 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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 2E10C27BBE9 for ; Sat, 8 Jul 2023 05:04:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHzB4-00023H-E7; Sat, 08 Jul 2023 00:04:10 -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 1qHzAx-00022M-GH for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qHzAw-00064e-Tr for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHzAw-0000aI-Ob for guix-patches@gnu.org; Sat, 08 Jul 2023 00:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH 2/2] gnu: patman: Add python-u-boot-pylib to inputs. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 04:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64149 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Vagrant Cascadian Cc: 64149@debbugs.gnu.org, ludo@gnu.org, efraim@flashner.co.il, Maxim Cournoyer Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.16887890342218 (code B ref 64149); Sat, 08 Jul 2023 04:04:02 +0000 Received: (at 64149) by debbugs.gnu.org; 8 Jul 2023 04:03:54 +0000 Received: from localhost ([127.0.0.1]:44002 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzAo-0000Zc-0v for submit@debbugs.gnu.org; Sat, 08 Jul 2023 00:03:54 -0400 Received: from mail-qt1-f181.google.com ([209.85.160.181]:61801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHzAm-0000ZI-4P for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 00:03:52 -0400 Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-4036507ddadso21225301cf.3 for <64149@debbugs.gnu.org>; Fri, 07 Jul 2023 21:03:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1688789027; x=1691381027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MDKPn9S7QPjwTiTadR2TKPVH/sTNYNVZnqz73IgUdyU=; b=dKRKyznZ+pClHcPtHto2OlCrCXbhcm5Aq11P+pbyHdMEZII3wn9msppu+9pMatfsF1 QHRCDKP9Z5BTSMZZ7PygzQwWAMsgEl9hZO4blC1PmjVEJAcQKP+WuwZmN/Gx3YXzI8Ao EyHlrK3v/SQ1pQPGsaDByMXr9AR+V97gA1KQ4knZoy+MERr4Bdwpuk1yfzpGFrH3LWfY RqbD/Fdn7wj/vc3CfpFF+kmRhffcDWmhMrR6BsrC8wV8CrtZ1MU7YH/DM9xl4miQD2I+ NfeW0VUIXZ/Dr6qVrwGHw7UV6Aakb3VW+PmOVRl+zIkwcr6U/+4zqSYk8RkeZAqebn1T uBRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688789027; x=1691381027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MDKPn9S7QPjwTiTadR2TKPVH/sTNYNVZnqz73IgUdyU=; b=E8Hk6iMNEX9z2OeR1di97ovCzt7ktFLYDkw7wkivIaphMxMXiXrcuntBeLUtexbjhu LzcMq4XKAjRllmEzVOAWuNrGyaEhwPIyHqrnsGrcSxGsT6jtRdmV1p6ATLs2Dd4unQmm z7GplHlqGE2x+/KDhf/+FyKoiL3pZz0oduS+jGCqBmYdRZYnR7PdhUlDQK1g4ouCRCL+ KbagQIPrjc6GqAZBhzLlO7IweYRlKzPbvxWNWUoIkXZRABFultv/aeROqHPf58X9gvLD PC05lLqqUqkZWwGA2d2FoyuSX6ieebmgDQ1kUqDbGuwcQ7+ygcXChFXqAaScqePaUbmR vadA== X-Gm-Message-State: ABy/qLYxHgKoVMC5SMg3MSbZArUaBToXhZBG4YMN4PMXVPAJAnDsaviM gKaLBiVcjstmjLhPZApq/Mk= X-Google-Smtp-Source: APBJJlHS2+aPtLVrZVm7FavVsjisZ1x/8SD4N5y5bnEWI5p3SiuqnpL/62avRkVGnXdumMy3oP8Uaw== X-Received: by 2002:ac8:7f8e:0:b0:403:92b9:abbb with SMTP id z14-20020ac87f8e000000b0040392b9abbbmr7993143qtj.56.1688789026817; Fri, 07 Jul 2023 21:03:46 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-179.b2b2c.ca. [205.236.230.179]) by smtp.gmail.com with ESMTPSA id c4-20020ac80084000000b003f3937c16c4sm2457264qtg.5.2023.07.07.21.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jul 2023 21:03:46 -0700 (PDT) From: Maxim Cournoyer Date: Sat, 8 Jul 2023 00:03:18 -0400 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: <87edllgc9u.fsf@wireframe> References: <87edllgc9u.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 * gnu/packages/bootloaders.scm (patman) [inputs]: Add python-u-boot-pylib. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index c1a76ab90e..789248afeb 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -869,7 +869,7 @@ (define-public patman (add-after 'unpack 'chdir (lambda _ (chdir "tools/patman")))))) - (inputs (list python-pygit2 python-requests)) + (inputs (list python-pygit2 python-requests python-u-boot-pylib)) (synopsis "Patch automation tool") (description "Patman is a patch automation script which: @itemize