diff options
| author | Herman Rimm <herman@rimm.ee> | 2024-12-13 20:58:32 +0100 |
|---|---|---|
| committer | Vagrant Cascadian <vagrant@debian.org> | 2024-12-18 14:25:01 -0800 |
| commit | 56c6466887a3fdca0bc407418f807448a58e35d2 (patch) | |
| tree | 629533f1bc9d077dae8587092d7cce0f012dee25 /gnu/packages/bootloaders.scm | |
| parent | 9e858182581fa17f6248bbbcb9d8742320a42217 (diff) | |
| download | guix-56c6466887a3fdca0bc407418f807448a58e35d2.tar.gz guix-56c6466887a3fdca0bc407418f807448a58e35d2.zip | |
gnu: u-boot: Use search-patches.
* gnu/packages/bootloaders.scm (%u-boot-rockchip-inno-usb-patch,
%u-boot-allow-disabling-openssl-patch): Remove variables, move comments.
(u-boot)[source]: Use search-patches.
* gnu/packages/patches/u-boot-allow-disabling-openssl.patch: Comment.
* gnu/packages/patches/u-boot-rockchip-inno-usb.patch: Remove E-Mail
metadata. Replace diffstat with comments. Reapply to U-Boot v2024.10.
Change-Id: I760a2e81bddfc2a80ef149fe1ac4496cbbd937a0
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index e70b73edab..4426da6872 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -745,33 +745,21 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for tree binary files. These are board description files used by Linux and BSD.") (license license:gpl2+))) -(define %u-boot-rockchip-inno-usb-patch - ;; Fix regression in 2020.10 causing freezes on boot with USB boot enabled. - ;; See https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-rockpro64/-/issues/4 - ;; and https://patchwork.ozlabs.org/project/uboot/patch/20210406151059.1187379-1-icenowy@aosc.io - (search-patch "u-boot-rockchip-inno-usb.patch")) - -(define %u-boot-allow-disabling-openssl-patch - ;; Fixes build of u-boot 2021.10 without openssl - ;; https://lists.denx.de/pipermail/u-boot/2021-October/462728.html - (search-patch "u-boot-allow-disabling-openssl.patch")) - (define u-boot (package (name "u-boot") (version "2024.10") - (source (origin - (patches - (list %u-boot-rockchip-inno-usb-patch - %u-boot-allow-disabling-openssl-patch)) - (method git-fetch) - (uri (git-reference - (url "https://source.denx.de/u-boot/u-boot.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://source.denx.de/u-boot/u-boot.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yrhb0izihv47p781dc4cp0znc5g225ayl7anz23c6jdrmfbpz2h")) + (patches (search-patches "u-boot-allow-disabling-openssl.patch" + "u-boot-rockchip-inno-usb.patch")))) (build-system gnu-build-system) (native-inputs (list bison |