From 61ba412769e3f3cd0d2f5cc2d7278988b78d18bb Mon Sep 17 00:00:00 2001 From: Hugo Buddelmeijer Date: Fri, 13 Mar 2026 16:17:49 +0100 Subject: [PATCH] gnu: grub: Fix build for the 64bit Hurd. Patch is unnecessary after grub is upgraded to 2.14 in https://codeberg.org/guix/guix/pulls/6457. * gnu/packages/bootloaders.scm (grub)[arguments]: Remove patch. * gnu/packages/patches/grub-hurd64.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. Fixes: guix/guix#7106 Merges: https://codeberg.org/guix/guix/pulls/7110 Change-Id: I288ae85f006e44e48e666123eb45cee9f1693026 Signed-off-by: Sharlatan Hellseher --- gnu/local.mk | 1 - gnu/packages/bootloaders.scm | 8 ------- gnu/packages/patches/grub-hurd64.patch | 32 -------------------------- 3 files changed, 41 deletions(-) delete mode 100644 gnu/packages/patches/grub-hurd64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1992126078..72f3cfff9f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1541,7 +1541,6 @@ dist_patch_DATA = \ %D%/packages/patches/grfcodec-gcc-compat.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ - %D%/packages/patches/grub-hurd64.patch \ %D%/packages/patches/grub-setup-root.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a5ef6b080f..2560e8c249 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -208,14 +208,6 @@ (setenv "BUILD_FREETYPE_CFLAGS" (string-append "-I" freetype "/include/freetype2")))))) - #$@(if (target-hurd64?) - #~((add-after 'unpack 'apply-hurd64-patch - (lambda _ - (let ((patch - #$(local-file - (search-patch "grub-hurd64.patch")))) - (invoke "patch" "--force" "-p1" "-i" patch))))) - #~()) (add-before 'check 'disable-flaky-test (lambda _ ;; This test is unreliable. For more information, see: diff --git a/gnu/packages/patches/grub-hurd64.patch b/gnu/packages/patches/grub-hurd64.patch deleted file mode 100644 index d5acd99eb8..0000000000 --- a/gnu/packages/patches/grub-hurd64.patch +++ /dev/null @@ -1,32 +0,0 @@ -Upstream-status: Not presented upstream. - -From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001 -From: Janneke Nieuwenhuizen -Date: Fri, 8 Nov 2024 11:47:49 +0100 -Subject: [PATCH] osdep/hurd: Support the 64bit Hurd. -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 - -* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device): -Use mach_msg_type_number_t instead of size_t. ---- - grub-core/osdep/hurd/getroot.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c -index 0efefdab4..b849700e6 100644 ---- a/grub-core/osdep/hurd/getroot.c -+++ b/grub-core/osdep/hurd/getroot.c -@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path) - file_t file; - error_t err; - char *argz = NULL, *name = NULL, *ret; -- size_t argz_len = 0; -+ mach_msg_type_number_t argz_len = 0; - int i; - - file = file_name_lookup (path, 0, 0); --- -Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org -Freelance IT https://www.JoyOfSource.com | Avatar® https://AvatarAcademy.com -