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/packages/bootloaders.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/bootloaders.scm') 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/" -- cgit v1.2.3