[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/33: gnu: grub: Build fix for the Hurd.
From: |
guix-commits |
Subject: |
02/33: gnu: grub: Build fix for the Hurd. |
Date: |
Tue, 10 Mar 2020 03:58:43 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd
in repository guix.
commit b718040fd7dc1367ef9bb498690466a94585cc68
Author: Jan Nieuwenhuizen <address@hidden>
AuthorDate: Sun Mar 8 19:11:55 2020 -0400
gnu: grub: Build fix for the Hurd.
* gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch:
New file
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/bootloaders.scm (grub): Use it.
---
gnu/local.mk | 1 +
gnu/packages/bootloaders.scm | 4 ++-
.../grub-verifiers-Blocklist-fallout-cleanup.patch | 41 ++++++++++++++++++++++
3 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index c0ec93c..b394b59 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -980,6 +980,7 @@ dist_patch_DATA =
\
%D%/packages/patches/grep-timing-sensitive-test.patch \
%D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \
%D%/packages/patches/grub-efi-fat-serial-number.patch \
+ %D%/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch \
%D%/packages/patches/gspell-dash-test.patch \
%D%/packages/patches/guile-1.8-cpp-4.5.patch \
%D%/packages/patches/guile-2.2-default-utf8.patch \
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index e3d2787..638ac32 100644
--- a/gnu/packages/bootloaders.scm
+++ b/gnu/packages/bootloaders.scm
@@ -91,7 +91,9 @@
(sha256
(base32
"0zgp5m3hmc9jh8wpjx6czzkh5id2y8n1k823x2mjvm2sk6b28ag5"))
- (patches (search-patches "grub-efi-fat-serial-number.patch"))))
+ (patches (search-patches
+ "grub-efi-fat-serial-number.patch"
+ "grub-verifiers-Blocklist-fallout-cleanup.patch"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
diff --git
a/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch
b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch
new file mode 100644
index 0000000..790d4b6
--- /dev/null
+++ b/gnu/packages/patches/grub-verifiers-Blocklist-fallout-cleanup.patch
@@ -0,0 +1,41 @@
+From 7606547586b2d6ca1b384e15e0358d3a3ddc48a6 Mon Sep 17 00:00:00 2001
+From: David Michael <address@hidden>
+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 <address@hidden>
+Reviewed-by: Daniel Kiper <address@hidden>
+
+Origin: upstream,
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=dabdfa1c6a80639197d05f683a445fa8615517fe
+Last-Update: 2019-12-12
+
+Patch-Name: verifiers-blocklist-fallout.patch
+---
+ 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);
+
- branch wip-hurd created (now c32b649), guix-commits, 2020/03/10
- 04/33: gnu: bootloader: Add grub-minimal-bootloader., guix-commits, 2020/03/10
- 03/33: gnu: Add grub-minimal., guix-commits, 2020/03/10
- 05/33: gnu: hurd: Fix hurd-target?., guix-commits, 2020/03/10
- 06/33: gnu: hurd: Add hurd-system?., guix-commits, 2020/03/10
- 07/33: gnu: java-jansi-native: Compile fix for the Hurd., guix-commits, 2020/03/10
- 08/33: gnu: make: Revert to 4.1 for the Hurd., guix-commits, 2020/03/10
- 01/33: gnu: flex-2.6.1: Build fix for the Hurd., guix-commits, 2020/03/10
- 11/33: gnu: glibc: Add and update patches for the Hurd., guix-commits, 2020/03/10
- 02/33: gnu: grub: Build fix for the Hurd.,
guix-commits <=
- 13/33: gnu: cross-libc: Build fix for the Hurd., guix-commits, 2020/03/10
- 17/33: gnu: pciutils: Build fix for the Hurd., guix-commits, 2020/03/10
- 25/33: gnu: commencement: hurd-headers-boot0: Build from tarball., guix-commits, 2020/03/10
- 27/33: gnu: commencement: glibc-intermediate: Build fixes for the Hurd., guix-commits, 2020/03/10
- 09/33: gnu: less: Build fix for the Hurd., guix-commits, 2020/03/10
- 18/33: gnu: shepherd: Build fix for the Hurd., guix-commits, 2020/03/10
- 10/33: gnu: fontconfig: Build fix for the Hurd., guix-commits, 2020/03/10
- 19/33: gnu: inetutils: Support for the Hurd., guix-commits, 2020/03/10
- 31/33: gnu: commencement: glibc-final: Allow gnumach-headers references., guix-commits, 2020/03/10
- 21/33: gnu: shadow: Build fix for the Hurd., guix-commits, 2020/03/10