From unknown Sat Sep 20 07:52:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48951] [PATCH] gnu: grub: Update to 2.06. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Jun 2021 00:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48951@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162337268032327 (code B ref -1); Fri, 11 Jun 2021 00:52:01 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jun 2021 00:51:20 +0000 Received: from localhost ([127.0.0.1]:37843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrVOE-0008PE-FQ for submit@debbugs.gnu.org; Thu, 10 Jun 2021 20:51:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:44218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrVO8-0008P3-PE for submit@debbugs.gnu.org; Thu, 10 Jun 2021 20:51:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrVO8-0004Y7-FP for guix-patches@gnu.org; Thu, 10 Jun 2021 20:51:08 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:49232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrVO4-0003BK-GI for guix-patches@gnu.org; Thu, 10 Jun 2021 20:51:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=kOvkrOY7Og2vfBbh4s/SRaCczDj8otZa3XZm+eaDV8g=; h=date:subject:to: from; b=a+OgLfkcJUpLnj3kY1j21PVpYRpz168z071ctAW+iY261GKHs3t+dcnw26szGD hm2cCWsRqeXaBZOL/zk3lKRDlmq8B7fLv+/K52H4wkyM468mrWM9LglyEDxHY+AjTXbLtq l2pITXkzGqFC83aX+RIxaS/gnMsyk6evoZzKJo5onTMEwhRmR1eVXIRMoPvcGDNFEk488A ikQ4lzFfXBsg/VTMcw6a7e6RiOSySaUL9HOBXxWRZ/HFYoyS3GEdwhyv3OpysuMEpj3PFD okh/b8Gv8aaIJ2CHwb59OqaX1VWGv52O6gnuS8uosntOB+K0BU7aeQSdZPoL5WAr42v+Ig == Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id acc29e16 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Fri, 11 Jun 2021 00:50:59 +0000 (UTC) From: Tobias Geerinckx-Rice Date: Fri, 11 Jun 2021 02:51:00 +0200 Message-Id: <20210611005100.2567-1-me@tobias.gr> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) [source]: Remove upstreamed patches. * gnu/packages/patches/grub-setup-root.patch: Update patch. * gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch, gnu/packages/patches/grub-cross-system-i686.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- Now with sweet putative (and untested) LUKS2 support! In fact everything's untested on metal since I can't risk a boot failure just yet. That's strictly a week-end game. Players welcome. Kind regards, T G-R gnu/local.mk | 2 - gnu/packages/bootloaders.scm | 8 +- .../patches/grub-cross-system-i686.patch | 96 ------------------ gnu/packages/patches/grub-setup-root.patch | 99 ++++++++++--------- ...-verifiers-Blocklist-fallout-cleanup.patch | 41 -------- 5 files changed, 57 insertions(+), 189 deletions(-) delete mode 100644 gnu/packages/patches/grub-cross-system-i686.patch delete mode 100644 gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch diff --git a/gnu/local.mk b/gnu/local.mk index ac08fe4600..060061d91e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,10 +1171,8 @@ dist_patch_DATA = \ %D%/packages/patches/grocsvs-dont-use-admiral.patch \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ - %D%/packages/patches/grub-cross-system-i686.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ - %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gst-libav-64channels-stack-corruption.patch \ %D%/packages/patches/gst-plugins-bad-fix-overflow.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ae3752cec3..79ea9ea345 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -88,18 +88,16 @@ (define-public grub (package (name "grub") - (version "2.04") + (version "2.06") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5")) + "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch" - "grub-verifiers-Blocklist-fallout-cleanup.patch" - "grub-cross-system-i686.patch")))) + "grub-setup-root.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/grub-cross-system-i686.patch b/gnu/packages/patches/grub-cross-system-i686.patch deleted file mode 100644 index 2715345d63..0000000000 --- a/gnu/packages/patches/grub-cross-system-i686.patch +++ /dev/null @@ -1,96 +0,0 @@ -Not upstreamed. -Fixes cross-build for the Hurd, from i686-linux, -see . - -From 17b242e7b80108f1467037e15b605595e4823b2e Mon Sep 17 00:00:00 2001 -From: "Jan (janneke) Nieuwenhuizen" -Date: Sun, 21 Jun 2020 15:10:40 +0200 -Subject: [PATCH v2] grub-core: Build fixes for i386 -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 - -* grub-core/lib/i386/relocator64.S: Avoid x86_64 instructions on i386. ---- - grub-core/lib/i386/relocator64.S | 33 +++++++++++++++++++++++++++++++- - 1 file changed, 32 insertions(+), 1 deletion(-) - -diff --git a/grub-core/lib/i386/relocator64.S b/grub-core/lib/i386/relocator64.S -index 148f38adb..ea39908c1 100644 ---- a/grub-core/lib/i386/relocator64.S -+++ b/grub-core/lib/i386/relocator64.S -@@ -63,7 +63,9 @@ VARIABLE(grub_relocator64_cr3) - movq %rax, %cr3 - #endif - -+#ifdef __x86_64__ - .code64 -+#endif - - /* mov imm64, %rax */ - .byte 0x48 -@@ -71,7 +73,14 @@ VARIABLE(grub_relocator64_cr3) - VARIABLE(grub_relocator64_rsp) - .quad 0 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsp */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc4 -+#else - movq %rax, %rsp -+#endif - - #ifdef GRUB_MACHINE_EFI - jmp LOCAL(skip_efi_stack_align) -@@ -85,7 +94,14 @@ VARIABLE(grub_relocator64_rsp) - */ - VARIABLE(grub_relocator64_efi_start) - /* Align the stack as UEFI spec requires. */ -+#ifndef __x86_64__ -+ .byte 0x48 -+ .byte 0x83 -+ .byte 0xe4 -+ .byte 0xf0 -+#else - andq $~15, %rsp -+#endif - - LOCAL(skip_efi_stack_align): - #endif -@@ -95,8 +111,15 @@ LOCAL(skip_efi_stack_align): - VARIABLE(grub_relocator64_rsi) - .quad 0 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsi */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc6 -+#else - movq %rax, %rsi -- -+#endif -+ - /* mov imm64, %rax */ - .byte 0x48 - .byte 0xb8 -@@ -128,6 +151,14 @@ VARIABLE(grub_relocator64_rdx) - #ifdef __APPLE__ - .byte 0xff, 0x25 - .quad 0 -+#elif !defined (__x86_64__) -+ /* jmp *LOCAL(jump_addr) (%rip) */ -+ .byte 0xff -+ .byte 0x25 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 - #else - jmp *LOCAL(jump_addr) (%rip) - #endif --- -Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org -Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com - diff --git a/gnu/packages/patches/grub-setup-root.patch b/gnu/packages/patches/grub-setup-root.patch index 1abe9c383a..e64a7dd6be 100644 --- a/gnu/packages/patches/grub-setup-root.patch +++ b/gnu/packages/patches/grub-setup-root.patch @@ -1,9 +1,53 @@ This patch is taken from OpenWrt, see: -https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch. +https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch + +nckx changed `char *root' to lazily pacify -Werror=discarded-qualifiers. It allows to use grub-bios-setup on a raw disk-images, without root permissions. +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -198,13 +198,13 @@ grub_install_get_image_target (const char *arg); + void + grub_util_bios_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes, int warn_short_mbr_gap); + void + grub_util_sparc_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes, int warn_short_mbr_gap); + +diff --git a/util/grub-install.c b/util/grub-install.c +index 0fbe7f78c..7f06aa1e3 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1721,7 +1721,7 @@ main (int argc, char *argv[]) + if (install_bootsector) + { + grub_util_bios_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, add_rs_codes, + !grub_install_is_short_mbrgap_supported ()); + +@@ -1752,7 +1752,7 @@ main (int argc, char *argv[]) + if (install_bootsector) + { + grub_util_sparc_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, + 0 /* unused */, 0 /* unused */ ); + +diff --git a/util/grub-setup.c b/util/grub-setup.c +index 1783224dd..48cde4950 100644 --- a/util/grub-setup.c +++ b/util/grub-setup.c @@ -87,6 +87,8 @@ static struct argp_option options[] = { @@ -23,7 +67,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. int force; int fs_probe; int allow_floppy; -@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct argp_state *state) arguments->dev_map = xstrdup (arg); break; @@ -44,18 +88,21 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. - dest_dev, arguments.force, + arguments.root_dev, dest_dev, arguments.force, arguments.fs_probe, arguments.allow_floppy, - arguments.add_rs_codes); + arguments.add_rs_codes, 0); +diff --git a/util/setup.c b/util/setup.c +index da5f2c07f..193745a9c 100644 --- a/util/setup.c +++ b/util/setup.c -@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att +@@ -252,14 +252,13 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)), void SETUP (const char *dir, const char *boot_file, const char *core_file, - const char *dest, int force, + char *root, const char *dest, int force, int fs_probe, int allow_floppy, - int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */ + int add_rs_codes __attribute__ ((unused)), /* unused on sparc64 */ + int warn_small) { char *core_path; char *boot_img, *core_img, *boot_path; @@ -63,7 +110,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. size_t boot_size, core_size; grub_uint16_t core_sectors; grub_device_t root_dev = 0, dest_dev, core_dev; -@@ -307,7 +306,10 @@ SETUP (const char *dir, +@@ -311,7 +310,10 @@ SETUP (const char *dir, core_dev = dest_dev; @@ -75,7 +122,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. char **root_devices = grub_guess_root_devices (dir); char **cur; int found = 0; -@@ -320,6 +322,8 @@ SETUP (const char *dir, +@@ -324,6 +326,8 @@ SETUP (const char *dir, char *drive; grub_device_t try_dev; @@ -84,41 +131,3 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. drive = grub_util_get_grub_dev (*cur); if (!drive) continue; ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha - void - grub_util_bios_setup (const char *dir, - const char *boot_file, const char *core_file, -- const char *dest, int force, -+ char *root, const char *dest, int force, - int fs_probe, int allow_floppy, - int add_rs_codes); - void - grub_util_sparc_setup (const char *dir, - const char *boot_file, const char *core_file, -- const char *dest, int force, -+ char *root, const char *dest, int force, - int fs_probe, int allow_floppy, - int add_rs_codes); - ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1712,7 +1712,7 @@ main (int argc, char *argv[]) - /* Now perform the installation. */ - if (install_bootsector) - grub_util_bios_setup (platdir, "boot.img", "core.img", -- install_drive, force, -+ NULL, install_drive, force, - fs_probe, allow_floppy, add_rs_codes); - break; - } -@@ -1738,7 +1738,7 @@ main (int argc, char *argv[]) - /* Now perform the installation. */ - if (install_bootsector) - grub_util_sparc_setup (platdir, "boot.img", "core.img", -- install_drive, force, -+ NULL, install_drive, force, - fs_probe, allow_floppy, - 0 /* unused */ ); - break; diff --git a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch deleted file mode 100644 index 2bea74ea95..0000000000 --- a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch +++ /dev/null @@ -1,41 +0,0 @@ -This patch is needed to build Grub on the Hurd. - -Taken from upstream: https://git.savannah.gnu.org/cgit/grub.git/commit//?id=dabdfa1c6a80639197d05f683a445fa8615517fe - -From 7606547586b2d6ca1b384e15e0358d3a3ddc48a6 Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Fri, 5 Jul 2019 07:45:59 -0400 -Subject: verifiers: Blocklist fallout cleanup - -Blocklist fallout cleanup after commit 5c6f9bc15 (generic/blocklist: Fix -implicit declaration of function grub_file_filter_disable_compression()). - -Signed-off-by: David Michael -Reviewed-by: Daniel Kiper - ---- - grub-core/osdep/generic/blocklist.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c -index ea2a511b6..2d9040302 100644 ---- a/grub-core/osdep/generic/blocklist.c -+++ b/grub-core/osdep/generic/blocklist.c -@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev, - - grub_disk_cache_invalidate_all (); - -- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); -+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); - if (file) - { - if (grub_file_size (file) != core_size) -@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev, - - grub_file_t file; - /* Now read the core image to determine where the sectors are. */ -- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); -+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); - if (! file) - grub_util_error ("%s", grub_errmsg); - -- 2.32.0 From unknown Sat Sep 20 07:52:32 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#48951] [PATCH] gnu: grub: Update to 2.06. Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 12 Jun 2021 19:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48951 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch Cc: 48951-done@debbugs.gnu.org, 48951@debbugs.gnu.org X-Debbugs-Original-Cc: 48951-done@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162352453118001 (code B ref -1); Sat, 12 Jun 2021 19:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 12 Jun 2021 19:02:11 +0000 Received: from localhost ([127.0.0.1]:42010 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls8tW-0004gH-MF for submit@debbugs.gnu.org; Sat, 12 Jun 2021 15:02:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:39258) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls8tV-0004gA-Bo for submit@debbugs.gnu.org; Sat, 12 Jun 2021 15:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ls8tV-0000S5-1Y for guix-patches@gnu.org; Sat, 12 Jun 2021 15:02:09 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:49392) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ls8tT-0005Cf-G5 for guix-patches@gnu.org; Sat, 12 Jun 2021 15:02:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=/cnhvo2Y1ozarT0l9EaxKw/rBrGQ+KtMmS1aUkeCDkU=; h=date:in-reply-to: subject:cc:from:references; b=a9UiSc6/v3xm+svXmmwVDxsJnXESzw+9K5q5xsNR nllp3Tokymj1j6zZzDa9DjviY7xOpX501VaWcW8j3o0Fhm9gU8RUUNZNhvSZFxN+93EeL7 oIuB47IBIo/l0bnufFDUNGd+IGSUWmlqOi1BIMnF81HWs7lpr++yAfFGC93agPYmIqlKFk 9TQX4F/8OZ1k4Mq2YRYppWv6S6ahl9quDIKOYrZcE6sKSSya/k0NToodmuFATC5sbDpmSf burE4JM9tBrHagjnrJjAJ/5pg8UjlKgXRIlT74j/KB/+Qfs94P+LS8wJTPvaxRgRXuamE8 7TS4eele4l47qKQ2Fca68g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a8f1de0b (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Sat, 12 Jun 2021 19:02:01 +0000 (UTC) References: <20210611005100.2567-1-me@tobias.gr> From: Tobias Geerinckx-Rice In-reply-to: <20210611005100.2567-1-me@tobias.gr> BIMI-Selector: v=BIMI1; s=default; Date: Sat, 12 Jun 2021 21:02:58 +0200 Message-ID: <87h7i29a8t.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MISSING_HEADERS=1.021, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.2 (-) --=-=-= Content-Type: text/plain; format=flowed Pushed as 2d115ea7edd4d5d85df18424e1e691935184a8c8. Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCYMUE4g0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15h6IBAMMqG326tx2UNNY42it1V1h6cXWPYrzcDKjbSG6s grqkAP4sTtuhe3z18x3gi2562Uvaqdv1JAKmXo6kKT+E+f94BQ== =wRBN -----END PGP SIGNATURE----- --=-=-=-- From unknown Sat Sep 20 07:52:32 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Tobias Geerinckx-Rice Subject: bug#48951: closed (Re: [bug#48951] [PATCH] gnu: grub: Update to 2.06.) Message-ID: References: <87h7i29a8t.fsf@nckx> <20210611005100.2567-1-me@tobias.gr> X-Gnu-PR-Message: they-closed 48951 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 48951@debbugs.gnu.org Date: Sat, 12 Jun 2021 19:03:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1623524582-18071-1" This is a multi-part message in MIME format... ------------=_1623524582-18071-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #48951: [PATCH] gnu: grub: Update to 2.06. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 48951@debbugs.gnu.org. --=20 48951: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D48951 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1623524582-18071-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 48951-done) by debbugs.gnu.org; 12 Jun 2021 19:02:07 +0000 Received: from localhost ([127.0.0.1]:42007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls8tT-0004g1-D8 for submit@debbugs.gnu.org; Sat, 12 Jun 2021 15:02:07 -0400 Received: from tobias.gr ([80.241.217.52]:44278) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ls8tR-0004fn-5y for 48951-done@debbugs.gnu.org; Sat, 12 Jun 2021 15:02:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=/cnhvo2Y1ozarT0l9EaxKw/rBrGQ+KtMmS1aUkeCDkU=; h=date:in-reply-to: subject:cc:from:references; b=a9UiSc6/v3xm+svXmmwVDxsJnXESzw+9K5q5xsNR nllp3Tokymj1j6zZzDa9DjviY7xOpX501VaWcW8j3o0Fhm9gU8RUUNZNhvSZFxN+93EeL7 oIuB47IBIo/l0bnufFDUNGd+IGSUWmlqOi1BIMnF81HWs7lpr++yAfFGC93agPYmIqlKFk 9TQX4F/8OZ1k4Mq2YRYppWv6S6ahl9quDIKOYrZcE6sKSSya/k0NToodmuFATC5sbDpmSf burE4JM9tBrHagjnrJjAJ/5pg8UjlKgXRIlT74j/KB/+Qfs94P+LS8wJTPvaxRgRXuamE8 7TS4eele4l47qKQ2Fca68g== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id a8f1de0b (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO); Sat, 12 Jun 2021 19:02:01 +0000 (UTC) References: <20210611005100.2567-1-me@tobias.gr> From: Tobias Geerinckx-Rice Subject: Re: [bug#48951] [PATCH] gnu: grub: Update to 2.06. In-reply-to: <20210611005100.2567-1-me@tobias.gr> BIMI-Selector: v=BIMI1; s=default; Date: Sat, 12 Jun 2021 21:02:58 +0200 Message-ID: <87h7i29a8t.fsf@nckx> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: 1.2 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Pushed as 2d115ea7edd4d5d85df18424e1e691935184a8c8. Kind regards, T G-R Content analysis details: (1.2 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 MISSING_HEADERS Missing To: header -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [80.241.217.52 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record X-Debbugs-Envelope-To: 48951-done Cc: 48951-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.2 (/) --=-=-= Content-Type: text/plain; format=flowed Pushed as 2d115ea7edd4d5d85df18424e1e691935184a8c8. Kind regards, T G-R --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIMEARYKACsWIQT12iAyS4c9C3o4dnINsP+IT1VteQUCYMUE4g0cbWVAdG9iaWFz LmdyAAoJEA2w/4hPVW15h6IBAMMqG326tx2UNNY42it1V1h6cXWPYrzcDKjbSG6s grqkAP4sTtuhe3z18x3gi2562Uvaqdv1JAKmXo6kKT+E+f94BQ== =wRBN -----END PGP SIGNATURE----- --=-=-=-- ------------=_1623524582-18071-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 11 Jun 2021 00:51:20 +0000 Received: from localhost ([127.0.0.1]:37843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrVOE-0008PE-FQ for submit@debbugs.gnu.org; Thu, 10 Jun 2021 20:51:20 -0400 Received: from lists.gnu.org ([209.51.188.17]:44218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrVO8-0008P3-PE for submit@debbugs.gnu.org; Thu, 10 Jun 2021 20:51:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34556) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrVO8-0004Y7-FP for guix-patches@gnu.org; Thu, 10 Jun 2021 20:51:08 -0400 Received: from tobias.gr ([2a02:c205:2020:6054::1]:49232) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrVO4-0003BK-GI for guix-patches@gnu.org; Thu, 10 Jun 2021 20:51:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tobias.gr; s=2018; bh=kOvkrOY7Og2vfBbh4s/SRaCczDj8otZa3XZm+eaDV8g=; h=date:subject:to: from; b=a+OgLfkcJUpLnj3kY1j21PVpYRpz168z071ctAW+iY261GKHs3t+dcnw26szGD hm2cCWsRqeXaBZOL/zk3lKRDlmq8B7fLv+/K52H4wkyM468mrWM9LglyEDxHY+AjTXbLtq l2pITXkzGqFC83aX+RIxaS/gnMsyk6evoZzKJo5onTMEwhRmR1eVXIRMoPvcGDNFEk488A ikQ4lzFfXBsg/VTMcw6a7e6RiOSySaUL9HOBXxWRZ/HFYoyS3GEdwhyv3OpysuMEpj3PFD okh/b8Gv8aaIJ2CHwb59OqaX1VWGv52O6gnuS8uosntOB+K0BU7aeQSdZPoL5WAr42v+Ig == Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id acc29e16 (TLSv1.2:ECDHE-ECDSA-AES256-GCM-SHA384:256:NO) for ; Fri, 11 Jun 2021 00:50:59 +0000 (UTC) From: Tobias Geerinckx-Rice To: guix-patches@gnu.org Subject: [PATCH] gnu: grub: Update to 2.06. Date: Fri, 11 Jun 2021 02:51:00 +0200 Message-Id: <20210611005100.2567-1-me@tobias.gr> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a02:c205:2020:6054::1; envelope-from=me@tobias.gr; helo=tobias.gr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.1 (/) [source]: Remove upstreamed patches. * gnu/packages/patches/grub-setup-root.patch: Update patch. * gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch, gnu/packages/patches/grub-cross-system-i686.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them. --- Now with sweet putative (and untested) LUKS2 support! In fact everything's untested on metal since I can't risk a boot failure just yet. That's strictly a week-end game. Players welcome. Kind regards, T G-R gnu/local.mk | 2 - gnu/packages/bootloaders.scm | 8 +- .../patches/grub-cross-system-i686.patch | 96 ------------------ gnu/packages/patches/grub-setup-root.patch | 99 ++++++++++--------- ...-verifiers-Blocklist-fallout-cleanup.patch | 41 -------- 5 files changed, 57 insertions(+), 189 deletions(-) delete mode 100644 gnu/packages/patches/grub-cross-system-i686.patch delete mode 100644 gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch diff --git a/gnu/local.mk b/gnu/local.mk index ac08fe4600..060061d91e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1171,10 +1171,8 @@ dist_patch_DATA = \ %D%/packages/patches/grocsvs-dont-use-admiral.patch \ %D%/packages/patches/gromacs-tinyxml2.patch \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ - %D%/packages/patches/grub-cross-system-i686.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ - %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \ %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gst-libav-64channels-stack-corruption.patch \ %D%/packages/patches/gst-plugins-bad-fix-overflow.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index ae3752cec3..79ea9ea345 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -88,18 +88,16 @@ (define-public grub (package (name "grub") - (version "2.04") + (version "2.06") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/grub/grub-" version ".tar.xz")) (sha256 (base32 - "0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5")) + "1qbycnxkx07arj9f2nlsi9kp0dyldspbv07ysdyd34qvz55a97mp")) (patches (search-patches "grub-efi-fat-serial-number.patch" - "grub-setup-root.patch" - "grub-verifiers-Blocklist-fallout-cleanup.patch" - "grub-cross-system-i686.patch")))) + "grub-setup-root.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/patches/grub-cross-system-i686.patch b/gnu/packages/patches/grub-cross-system-i686.patch deleted file mode 100644 index 2715345d63..0000000000 --- a/gnu/packages/patches/grub-cross-system-i686.patch +++ /dev/null @@ -1,96 +0,0 @@ -Not upstreamed. -Fixes cross-build for the Hurd, from i686-linux, -see . - -From 17b242e7b80108f1467037e15b605595e4823b2e Mon Sep 17 00:00:00 2001 -From: "Jan (janneke) Nieuwenhuizen" -Date: Sun, 21 Jun 2020 15:10:40 +0200 -Subject: [PATCH v2] grub-core: Build fixes for i386 -Content-Transfer-Encoding: 8bit -Content-Type: text/plain; charset=UTF-8 - -* grub-core/lib/i386/relocator64.S: Avoid x86_64 instructions on i386. ---- - grub-core/lib/i386/relocator64.S | 33 +++++++++++++++++++++++++++++++- - 1 file changed, 32 insertions(+), 1 deletion(-) - -diff --git a/grub-core/lib/i386/relocator64.S b/grub-core/lib/i386/relocator64.S -index 148f38adb..ea39908c1 100644 ---- a/grub-core/lib/i386/relocator64.S -+++ b/grub-core/lib/i386/relocator64.S -@@ -63,7 +63,9 @@ VARIABLE(grub_relocator64_cr3) - movq %rax, %cr3 - #endif - -+#ifdef __x86_64__ - .code64 -+#endif - - /* mov imm64, %rax */ - .byte 0x48 -@@ -71,7 +73,14 @@ VARIABLE(grub_relocator64_cr3) - VARIABLE(grub_relocator64_rsp) - .quad 0 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsp */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc4 -+#else - movq %rax, %rsp -+#endif - - #ifdef GRUB_MACHINE_EFI - jmp LOCAL(skip_efi_stack_align) -@@ -85,7 +94,14 @@ VARIABLE(grub_relocator64_rsp) - */ - VARIABLE(grub_relocator64_efi_start) - /* Align the stack as UEFI spec requires. */ -+#ifndef __x86_64__ -+ .byte 0x48 -+ .byte 0x83 -+ .byte 0xe4 -+ .byte 0xf0 -+#else - andq $~15, %rsp -+#endif - - LOCAL(skip_efi_stack_align): - #endif -@@ -95,8 +111,15 @@ LOCAL(skip_efi_stack_align): - VARIABLE(grub_relocator64_rsi) - .quad 0 - -+#ifndef __x86_64__ -+ /* movq %rax, %rsi */ -+ .byte 0x48 -+ .byte 0x89 -+ .byte 0xc6 -+#else - movq %rax, %rsi -- -+#endif -+ - /* mov imm64, %rax */ - .byte 0x48 - .byte 0xb8 -@@ -128,6 +151,14 @@ VARIABLE(grub_relocator64_rdx) - #ifdef __APPLE__ - .byte 0xff, 0x25 - .quad 0 -+#elif !defined (__x86_64__) -+ /* jmp *LOCAL(jump_addr) (%rip) */ -+ .byte 0xff -+ .byte 0x25 -+ .byte 0 -+ .byte 0 -+ .byte 0 -+ .byte 0 - #else - jmp *LOCAL(jump_addr) (%rip) - #endif --- -Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org -Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com - diff --git a/gnu/packages/patches/grub-setup-root.patch b/gnu/packages/patches/grub-setup-root.patch index 1abe9c383a..e64a7dd6be 100644 --- a/gnu/packages/patches/grub-setup-root.patch +++ b/gnu/packages/patches/grub-setup-root.patch @@ -1,9 +1,53 @@ This patch is taken from OpenWrt, see: -https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch. +https://github.com/openwrt/openwrt/blob/master/package/boot/grub2/patches/100-grub_setup_root.patch + +nckx changed `char *root' to lazily pacify -Werror=discarded-qualifiers. It allows to use grub-bios-setup on a raw disk-images, without root permissions. +--- a/include/grub/util/install.h ++++ b/include/grub/util/install.h +@@ -198,13 +198,13 @@ grub_install_get_image_target (const char *arg); + void + grub_util_bios_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes, int warn_short_mbr_gap); + void + grub_util_sparc_setup (const char *dir, + const char *boot_file, const char *core_file, +- const char *dest, int force, ++ char *root, const char *dest, int force, + int fs_probe, int allow_floppy, + int add_rs_codes, int warn_short_mbr_gap); + +diff --git a/util/grub-install.c b/util/grub-install.c +index 0fbe7f78c..7f06aa1e3 100644 +--- a/util/grub-install.c ++++ b/util/grub-install.c +@@ -1721,7 +1721,7 @@ main (int argc, char *argv[]) + if (install_bootsector) + { + grub_util_bios_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, add_rs_codes, + !grub_install_is_short_mbrgap_supported ()); + +@@ -1752,7 +1752,7 @@ main (int argc, char *argv[]) + if (install_bootsector) + { + grub_util_sparc_setup (platdir, "boot.img", "core.img", +- install_drive, force, ++ NULL, install_drive, force, + fs_probe, allow_floppy, + 0 /* unused */, 0 /* unused */ ); + +diff --git a/util/grub-setup.c b/util/grub-setup.c +index 1783224dd..48cde4950 100644 --- a/util/grub-setup.c +++ b/util/grub-setup.c @@ -87,6 +87,8 @@ static struct argp_option options[] = { @@ -23,7 +67,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. int force; int fs_probe; int allow_floppy; -@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct argp_state *state) arguments->dev_map = xstrdup (arg); break; @@ -44,18 +88,21 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. - dest_dev, arguments.force, + arguments.root_dev, dest_dev, arguments.force, arguments.fs_probe, arguments.allow_floppy, - arguments.add_rs_codes); + arguments.add_rs_codes, 0); +diff --git a/util/setup.c b/util/setup.c +index da5f2c07f..193745a9c 100644 --- a/util/setup.c +++ b/util/setup.c -@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att +@@ -252,14 +252,13 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)), void SETUP (const char *dir, const char *boot_file, const char *core_file, - const char *dest, int force, + char *root, const char *dest, int force, int fs_probe, int allow_floppy, - int add_rs_codes __attribute__ ((unused))) /* unused on sparc64 */ + int add_rs_codes __attribute__ ((unused)), /* unused on sparc64 */ + int warn_small) { char *core_path; char *boot_img, *core_img, *boot_path; @@ -63,7 +110,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. size_t boot_size, core_size; grub_uint16_t core_sectors; grub_device_t root_dev = 0, dest_dev, core_dev; -@@ -307,7 +306,10 @@ SETUP (const char *dir, +@@ -311,7 +310,10 @@ SETUP (const char *dir, core_dev = dest_dev; @@ -75,7 +122,7 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. char **root_devices = grub_guess_root_devices (dir); char **cur; int found = 0; -@@ -320,6 +322,8 @@ SETUP (const char *dir, +@@ -324,6 +326,8 @@ SETUP (const char *dir, char *drive; grub_device_t try_dev; @@ -84,41 +131,3 @@ It allows to use grub-bios-setup on a raw disk-images, without root permissions. drive = grub_util_get_grub_dev (*cur); if (!drive) continue; ---- a/include/grub/util/install.h -+++ b/include/grub/util/install.h -@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha - void - grub_util_bios_setup (const char *dir, - const char *boot_file, const char *core_file, -- const char *dest, int force, -+ char *root, const char *dest, int force, - int fs_probe, int allow_floppy, - int add_rs_codes); - void - grub_util_sparc_setup (const char *dir, - const char *boot_file, const char *core_file, -- const char *dest, int force, -+ char *root, const char *dest, int force, - int fs_probe, int allow_floppy, - int add_rs_codes); - ---- a/util/grub-install.c -+++ b/util/grub-install.c -@@ -1712,7 +1712,7 @@ main (int argc, char *argv[]) - /* Now perform the installation. */ - if (install_bootsector) - grub_util_bios_setup (platdir, "boot.img", "core.img", -- install_drive, force, -+ NULL, install_drive, force, - fs_probe, allow_floppy, add_rs_codes); - break; - } -@@ -1738,7 +1738,7 @@ main (int argc, char *argv[]) - /* Now perform the installation. */ - if (install_bootsector) - grub_util_sparc_setup (platdir, "boot.img", "core.img", -- install_drive, force, -+ NULL, install_drive, force, - fs_probe, allow_floppy, - 0 /* unused */ ); - break; diff --git a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch deleted file mode 100644 index 2bea74ea95..0000000000 --- a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch +++ /dev/null @@ -1,41 +0,0 @@ -This patch is needed to build Grub on the Hurd. - -Taken from upstream: https://git.savannah.gnu.org/cgit/grub.git/commit//?id=dabdfa1c6a80639197d05f683a445fa8615517fe - -From 7606547586b2d6ca1b384e15e0358d3a3ddc48a6 Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Fri, 5 Jul 2019 07:45:59 -0400 -Subject: verifiers: Blocklist fallout cleanup - -Blocklist fallout cleanup after commit 5c6f9bc15 (generic/blocklist: Fix -implicit declaration of function grub_file_filter_disable_compression()). - -Signed-off-by: David Michael -Reviewed-by: Daniel Kiper - ---- - grub-core/osdep/generic/blocklist.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/grub-core/osdep/generic/blocklist.c b/grub-core/osdep/generic/blocklist.c -index ea2a511b6..2d9040302 100644 ---- a/grub-core/osdep/generic/blocklist.c -+++ b/grub-core/osdep/generic/blocklist.c -@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_t root_dev, - - grub_disk_cache_invalidate_all (); - -- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); -+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); - if (file) - { - if (grub_file_size (file) != core_size) -@@ -116,7 +116,7 @@ grub_install_get_blocklist (grub_device_t root_dev, - - grub_file_t file; - /* Now read the core image to determine where the sectors are. */ -- file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | FILE_TYPE_NO_DECOMPRESS); -+ file = grub_file_open (core_path_dev, GRUB_FILE_TYPE_NONE | GRUB_FILE_TYPE_NO_DECOMPRESS); - if (! file) - grub_util_error ("%s", grub_errmsg); - -- 2.32.0 ------------=_1623524582-18071-1--