From patchwork Sun Jul 9 01:47:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vagrant Cascadian X-Patchwork-Id: 51642 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 5024927BBE9; Sun, 9 Jul 2023 02:49:44 +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_INVALID, DKIM_SIGNED,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 107F527BBE2 for ; Sun, 9 Jul 2023 02:49:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qIJXu-0007Nj-9h; Sat, 08 Jul 2023 21:49:06 -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 1qIJXs-0007Mw-71 for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:04 -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 1qIJXr-000233-VR for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qIJXr-00088O-S0 for guix-patches@gnu.org; Sat, 08 Jul 2023 21:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64149] [PATCH 4/5] gnu: Add python-u-boot-pylib. Resent-From: vagrant@debian.org Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 09 Jul 2023 01:49:03 +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: 64149@debbugs.gnu.org Cc: vagrant@debian.org, ludo@gnu.org, efraim@flashner.co.il, maxim.cournoyer@gmail.com Received: via spool by 64149-submit@debbugs.gnu.org id=B64149.168886731331177 (code B ref 64149); Sun, 09 Jul 2023 01:49:03 +0000 Received: (at 64149) by debbugs.gnu.org; 9 Jul 2023 01:48:33 +0000 Received: from localhost ([127.0.0.1]:45389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJXM-00086e-RF for submit@debbugs.gnu.org; Sat, 08 Jul 2023 21:48:33 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:42734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qIJXL-00085W-09 for 64149@debbugs.gnu.org; Sat, 08 Jul 2023 21:48:31 -0400 Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) (Authenticated sender: vagrant@aikidev.net) by cascadia.aikidev.net (Postfix) with ESMTPSA id ECEAD1ACEC; Sat, 8 Jul 2023 18:48:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1688867303; bh=QNDHfu2r/dDyxCY9V7EKWukEuP2g23xU/COM+tTxPok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=of+DbGRd1Fa5tnD9XXQSXitdo+otrZ4YxVTVtmHkWCEI/RR2qbyw1rnsiaZ3dOGWN THoGgmooN+AKKA4/KuOTaVmoQhYYm09SfV8GGJh/KLy9TkNtX6cxBqAVOWpuhcZOes 8Q8BEKqE2fol45MSIXeUEApnr9biG8T/bCDZfZaQPeDMK/OGsqfhipxgwJF46MN8Zr s+m4V3X2IJI0fOw5dvu4OWtwqY2+zn3Q8GhyXDgVvkCeSIaKhd1Uo/pFqff6Tk4QVJ T1fklqYs9dZcXrWUBvXhfFFboHnCrXh6dHbGPrO4uXR5QJNF+WVxqmPQ86m4BX19My A8a3HOCqDs5Rw== From: vagrant@debian.org Date: Sat, 8 Jul 2023 18:47:35 -0700 Message-Id: <20230709014736.54114-4-vagrant@debian.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230709014736.54114-1-vagrant@debian.org> References: <87zg45g8yg.fsf@wireframe> <20230709014736.54114-1-vagrant@debian.org> 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 From: Maxim Cournoyer * 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 18f6398692..827894e447 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/" @@ -840,6 +841,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*"]