[Buildroot] [git commit branch/2021.02.x] boot/shim: fix build issue due to gnu-efi
From: Peter Korsgaard <peter@korsgaard.com>
Date: 2021-04-06 11:09:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=283662245f9997c88a4698db3f8aeb3bc0823c47 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2021.02.x shim fails to build with: console.c:448:5: error: ???EFI_WARN_UNKOWN_GLYPH??? undeclared here (not in a function); did you mean ???EFI_WARN_UNKNOWN_GLYPH???? 448 | { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, | ^~~~~~~~~~~~~~~~~~~~~ | EFI_WARN_UNKNOWN_GLYPH make[2]: *** [<builtin>: console.o] Error 1 make[2]: *** Waiting for unfinished jobs.... Backport upstream commit d230d02f990f02293736dca78b108f86c86d1bd0 to resolve this issue. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com> (cherry picked from commit 888f47cbce17807e3c5f07644e27f2fe37f908dc) Signed-off-by: Peter Korsgaard <peter@korsgaard.com> --- ...-a-typo-in-the-EFI-warning-list-in-gnu-ef.patch | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+)
diff --git a/boot/shim/0001-console-Fix-a-typo-in-the-EFI-warning-list-in-gnu-ef.patch b/boot/shim/0001-console-Fix-a-typo-in-the-EFI-warning-list-in-gnu-ef.patch
new file mode 100644
index 0000000000..77d1b54f16
--- /dev/null
+++ b/boot/shim/0001-console-Fix-a-typo-in-the-EFI-warning-list-in-gnu-ef.patch@@ -0,0 +1,57 @@ +From b00d7f63df7ee6f74a63515f1469768e9cb2aa7a Mon Sep 17 00:00:00 2001 +From: Peter Jones <pjones@redhat.com> +Date: Mon, 26 Aug 2019 16:12:05 -0400 +Subject: [PATCH] console: Fix a typo in the EFI warning list in gnu-efi + +Some versions of gnu-efi have a typo, in which "EFI_WARN_UNKNOWN_GLYPH" +is accidentally "EFI_WARN_UNKOWN_GLYPH". Work around that, so that we +can use the not-silly one in console.c's list of error and warning +messages. + +This is a backport from devel for: + + commit 5f62b22ccd636d326b3229a2b196118701c6f3f7 + Author: Peter Jones <pjones@redhat.com> + Date: Mon Aug 26 16:12:05 2019 -0400 + +Signed-off-by: Peter Jones <pjones@redhat.com> +Upstream: d230d02f990f02293736dca78b108f86c86d1bd0 +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> +--- + include/console.h | 6 ++++++ + lib/console.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/include/console.h b/include/console.h +index deb4fa3..00da98d 100644 +--- a/include/console.h ++++ b/include/console.h +@@ -7,6 +7,12 @@ + #define PrintAt(fmt, ...) \ + ({"Do not directly call PrintAt() use console_print_at() instead" = 1;}); + ++#if !defined(EFI_WARN_UNKNOWN_GLYPH) && defined(EFI_WARN_UNKOWN_GLYPH) ++#define EFI_WARN_UNKNOWN_GLYPH EFI_WARN_UNKOWN_GLYPH ++#elif !defined(EFI_WARN_UNKNOWN_GLYPH) ++#define EFI_WARN_UNKNOWN_GLYPH EFIWARN(1) ++#endif ++ + EFI_STATUS + console_get_keystroke(EFI_INPUT_KEY *key); + UINTN +diff --git a/lib/console.c b/lib/console.c +index 3aee41c..ccd4d4d 100644 +--- a/lib/console.c ++++ b/lib/console.c +@@ -445,7 +445,7 @@ static struct { + { EFI_SECURITY_VIOLATION, L"Security Violation"}, + + // warnings +- { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, ++ { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, + { EFI_WARN_DELETE_FAILURE, L"Warning Delete Failure"}, + { EFI_WARN_WRITE_FAILURE, L"Warning Write Failure"}, + { EFI_WARN_BUFFER_TOO_SMALL, L"Warning Buffer Too Small"}, +-- +2.30.2 +