aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2019-10-02 13:15:46 +0200
committerFelix Fietkau <nbd@nbd.name>2019-10-02 13:16:21 +0200
commit9f07d1519c1bf76e612631463ebeb9d0a0a72ed5 (patch)
tree4bc663f331dd1e5c6014df96664ff059933ec05b
parent5f8e5872406dad4df254c26a4166c58de44901ad (diff)
downloadupstream-9f07d1519c1bf76e612631463ebeb9d0a0a72ed5.tar.gz
upstream-9f07d1519c1bf76e612631463ebeb9d0a0a72ed5.tar.bz2
upstream-9f07d1519c1bf76e612631463ebeb9d0a0a72ed5.zip
grub2: fix a build regression on non-linux systems
Merge an upstream commit to correct a missing rename in generic code Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/boot/grub2/patches/001-verifiers-Blocklist-fallout-cleanup.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/package/boot/grub2/patches/001-verifiers-Blocklist-fallout-cleanup.patch b/package/boot/grub2/patches/001-verifiers-Blocklist-fallout-cleanup.patch
new file mode 100644
index 0000000000..74d68a6cda
--- /dev/null
+++ b/package/boot/grub2/patches/001-verifiers-Blocklist-fallout-cleanup.patch
@@ -0,0 +1,31 @@
+From: David Michael <fedora.dm0@gmail.com>
+Date: Fri, 5 Jul 2019 07:45:59 -0400
+Subject: [PATCH] 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>
+---
+
+--- a/grub-core/osdep/generic/blocklist.c
++++ b/grub-core/osdep/generic/blocklist.c
+@@ -59,7 +59,7 @@ grub_install_get_blocklist (grub_device_
+
+ 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_
+
+ 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);
+