diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-11 02:05:33 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2021-06-12 20:58:16 +0200 |
| commit | 2d115ea7edd4d5d85df18424e1e691935184a8c8 (patch) | |
| tree | df3102170150834137112db92be7564761c8a2a2 /gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch | |
| parent | 154a4e046281c28e39b5016e965d3d937a2ea4a1 (diff) | |
| download | guix-patches-2d115ea7edd4d5d85df18424e1e691935184a8c8.tar guix-patches-2d115ea7edd4d5d85df18424e1e691935184a8c8.tar.gz | |
gnu: grub: Update to 2.06.
[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.
Diffstat (limited to 'gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch')
| -rw-r--r-- | gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch | 41 |
1 files changed, 0 insertions, 41 deletions
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 <fedora.dm0@gmail.com> -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 <fedora.dm0@gmail.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> - ---- - 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); - |