summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/bootloaders.scm8
-rw-r--r--gnu/packages/patches/grub-hurd64.patch32
3 files changed, 0 insertions, 41 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 19921260789..72f3cfff9f6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1541,7 +1541,6 @@ dist_patch_DATA = \
1541 %D%/packages/patches/grfcodec-gcc-compat.patch \ 1541 %D%/packages/patches/grfcodec-gcc-compat.patch \
1542 %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ 1542 %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
1543 %D%/packages/patches/grub-efi-fat-serial-number.patch \ 1543 %D%/packages/patches/grub-efi-fat-serial-number.patch \
1544 %D%/packages/patches/grub-hurd64.patch \
1545 %D%/packages/patches/grub-setup-root.patch \ 1544 %D%/packages/patches/grub-setup-root.patch \
1546 %D%/packages/patches/guile-1.8-cpp-4.5.patch \ 1545 %D%/packages/patches/guile-1.8-cpp-4.5.patch \
1547 %D%/packages/patches/guile-2.2-skip-oom-test.patch \ 1546 %D%/packages/patches/guile-2.2-skip-oom-test.patch \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index a5ef6b080ff..2560e8c2492 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -208,14 +208,6 @@
208 (setenv "BUILD_FREETYPE_CFLAGS" 208 (setenv "BUILD_FREETYPE_CFLAGS"
209 (string-append "-I" freetype 209 (string-append "-I" freetype
210 "/include/freetype2")))))) 210 "/include/freetype2"))))))
211 #$@(if (target-hurd64?)
212 #~((add-after 'unpack 'apply-hurd64-patch
213 (lambda _
214 (let ((patch
215 #$(local-file
216 (search-patch "grub-hurd64.patch"))))
217 (invoke "patch" "--force" "-p1" "-i" patch)))))
218 #~())
219 (add-before 'check 'disable-flaky-test 211 (add-before 'check 'disable-flaky-test
220 (lambda _ 212 (lambda _
221 ;; This test is unreliable. For more information, see: 213 ;; 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 d5acd99eb8c..00000000000
--- a/gnu/packages/patches/grub-hurd64.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Upstream-status: Not presented upstream.
2
3From a4eb7d1f2cbd02132a9f5512f1294182576d4653 Mon Sep 17 00:00:00 2001
4From: Janneke Nieuwenhuizen <janneke@gnu.org>
5Date: Fri, 8 Nov 2024 11:47:49 +0100
6Subject: [PATCH] osdep/hurd: Support the 64bit Hurd.
7Content-Transfer-Encoding: 8bit
8Content-Type: text/plain; charset=UTF-8
9
10* grub-core/osdep/hurd/getroot.c (grub_util_find_hurd_root_device):
11Use mach_msg_type_number_t instead of size_t.
12---
13 grub-core/osdep/hurd/getroot.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/grub-core/osdep/hurd/getroot.c b/grub-core/osdep/hurd/getroot.c
17index 0efefdab4..b849700e6 100644
18--- a/grub-core/osdep/hurd/getroot.c
19+++ b/grub-core/osdep/hurd/getroot.c
20@@ -58,7 +58,7 @@ grub_util_find_hurd_root_device (const char *path)
21 file_t file;
22 error_t err;
23 char *argz = NULL, *name = NULL, *ret;
24- size_t argz_len = 0;
25+ mach_msg_type_number_t argz_len = 0;
26 int i;
27
28 file = file_name_lookup (path, 0, 0);
29--
30Janneke Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond https://LilyPond.org
31Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com
32