diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-05 10:40:55 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-01-10 11:37:29 -0500 |
| commit | c42ae60a84f0e7c30126f726a0057781b81f5074 (patch) | |
| tree | a439ec8a3114d86aff07e687e88bd11e2adbcf87 /gnu/packages/bootloaders.scm | |
| parent | 65d24b9a24dd7ca195b7138ded63764a812e90e9 (diff) | |
| download | guix-c42ae60a84f0e7c30126f726a0057781b81f5074.tar guix-c42ae60a84f0e7c30126f726a0057781b81f5074.tar.gz | |
gnu: patman: Fix incomplete get-maintainer patch.
The full set of patches already merged into the U-Boot is included for
simplicity and avoiding mistakes like the previous one, where a conflicting
hunk got dropped, causing the following error when running patman:
WARNING: Unknown setting get_maintainer_script
* gnu/packages/bootloaders.scm (u-boot) [source]: Replace the
u-boot-patman-fix-help.patch, u-boot-patman-local-conf.patch and
u-boot-patman-get-maintainer.patch with u-boot-patman-guix-integration.patch.
* gnu/local.mk (dist_patch_DATA): Update patch registrations.
* gnu/packages/patches/u-boot-patman-fix-help.patch: Delete file.
* gnu/packages/patches/u-boot-patman-get-maintainer.patch: Likewise.
* gnu/packages/patches/u-boot-patman-local-conf.patch: Likewise.
* gnu/packages/patches/u-boot-patman-guix-integration.patch: New file.
Reported-by: Jelle Licht <jlicht@fsfe.org>
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index caa8f0bb8d..6e6bdb4c08 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -652,9 +652,7 @@ tree binary files. These are board description files used by Linux and BSD.") %u-boot-sifive-prevent-relocating-initrd-fdt %u-boot-rk3399-enable-emmc-phy-patch (search-patch "u-boot-infodocs-target.patch") - (search-patch "u-boot-patman-fix-help.patch") - (search-patch "u-boot-patman-local-conf.patch") - (search-patch "u-boot-patman-get-maintainer.patch"))) + (search-patch "u-boot-patman-guix-integration.patch"))) (method url-fetch) (uri (string-append "https://ftp.denx.de/pub/u-boot/" |