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/local.mk | |
| parent | 65d24b9a24dd7ca195b7138ded63764a812e90e9 (diff) | |
| download | 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/local.mk')
| -rw-r--r-- | gnu/local.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 721a1ae067..184f43e753 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1918,9 +1918,7 @@ dist_patch_DATA = \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-allow-disabling-openssl.patch \ %D%/packages/patches/u-boot-infodocs-target.patch \ - %D%/packages/patches/u-boot-patman-fix-help.patch \ - %D%/packages/patches/u-boot-patman-get-maintainer.patch \ - %D%/packages/patches/u-boot-patman-local-conf.patch \ + %D%/packages/patches/u-boot-patman-guix-integration.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 \ |