From c42ae60a84f0e7c30126f726a0057781b81f5074 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 5 Jan 2023 10:40:55 -0500 Subject: 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 --- gnu/local.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/local.mk') 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 \ -- cgit v1.2.3