diff options
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/bootloaders.scm | 23 | ||||
| -rw-r--r-- | gnu/packages/patches/u-boot-fix-u-boot-lib-build.patch | 24 |
3 files changed, 47 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index cdce2666e5..ad31e8d2de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2005,6 +2005,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 ea69fc890b..8afb2c3293 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -655,7 +655,8 @@ tree binary files. These are board description files used by Linux and BSD.") %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/" @@ -841,6 +842,26 @@ CONFIG_TOOLS_LIBCRYPTO=n") " 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*"] |