From 9f07d1519c1bf76e612631463ebeb9d0a0a72ed5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 2 Oct 2019 13:15:46 +0200 Subject: [PATCH] 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 --- ...-verifiers-Blocklist-fallout-cleanup.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/boot/grub2/patches/001-verifiers-Blocklist-fallout-cleanup.patch 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 +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 +Reviewed-by: Daniel Kiper +--- + +--- 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); +