From aa936e7b0ca808422456ad706f81378c4db003fc Mon Sep 17 00:00:00 2001 From: Nicolas Frayer Date: Fri, 29 Sep 2023 18:06:49 +0200 Subject: [PATCH] ofdisk: Fix missing #include in ofdisk.c Signed-off-by: Nicolas Frayer --- 0337-Fix-missing-include-in-ofdisk.c.patch | 28 ++++++++++++++++++++++ grub.patches | 1 + grub2.spec | 5 +++- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0337-Fix-missing-include-in-ofdisk.c.patch diff --git a/0337-Fix-missing-include-in-ofdisk.c.patch b/0337-Fix-missing-include-in-ofdisk.c.patch new file mode 100644 index 0000000..84a1240 --- /dev/null +++ b/0337-Fix-missing-include-in-ofdisk.c.patch @@ -0,0 +1,28 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Peter Jones +Date: Fri, 29 Sep 2023 10:56:11 -0400 +Subject: [PATCH] Fix missing #include in ofdisk.c + +Recently we started building with -Werror=implicit-function-declaration, +and discovered that ofdisk.c is missing an include to declare +grub_env_get(). + +This patch adds that #include. + +Signed-off-by: Peter Jones +--- + grub-core/disk/ieee1275/ofdisk.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c +index 5534684..6e33d5d 100644 +--- a/grub-core/disk/ieee1275/ofdisk.c ++++ b/grub-core/disk/ieee1275/ofdisk.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + + static char *last_devpath; + static grub_ieee1275_ihandle_t last_ihandle; diff --git a/grub.patches b/grub.patches index b870cef..5ae522f 100644 --- a/grub.patches +++ b/grub.patches @@ -334,3 +334,4 @@ Patch0333: 0333-util-Enable-default-kernel-for-updates.patch Patch0334: 0334-efi-http-change-uint32_t-to-uintn_t.patch Patch0335: 0335-Add-Install-section-to-aux-systemd-units.patch Patch0336: 0336-arm64-Use-proper-memory-type-for-kernel-allocation.patch +Patch0337: 0337-Fix-missing-include-in-ofdisk.c.patch diff --git a/grub2.spec b/grub2.spec index 6a8ad61..74cf971 100644 --- a/grub2.spec +++ b/grub2.spec @@ -17,7 +17,7 @@ Name: grub2 Epoch: 1 Version: 2.06 -Release: 101%{?dist} +Release: 102%{?dist} Summary: Bootloader with support for Linux, Multiboot and more License: GPLv3+ URL: http://www.gnu.org/software/grub/ @@ -548,6 +548,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg %endif %changelog +* Fri Sep 29 2023 Nicolas Frayer - 2.06-102 +- ofdisk: Fix missing #include in ofdisk.c + * Thu Sep 28 2023 Christian Glombek - 2.06-101 - spec: Fix grub2-systemd-integration.service name