From e0cafca96d1ec182fe9c456289c46bab6f8fc4b02ce0273e149ff0301c9838cd Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Mon, 16 Mar 2020 09:43:20 +0000 Subject: [PATCH] - Add shim-fix-gnu-efi-3.0.11.patch to fix the build error caused by the upgrade of gnu-efi OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=155 --- shim-fix-gnu-efi-3.0.11.patch | 16 ++++++++++++++++ shim.changes | 6 ++++++ shim.spec | 7 +++++-- 3 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 shim-fix-gnu-efi-3.0.11.patch diff --git a/shim-fix-gnu-efi-3.0.11.patch b/shim-fix-gnu-efi-3.0.11.patch new file mode 100644 index 0000000..d06bb4e --- /dev/null +++ b/shim-fix-gnu-efi-3.0.11.patch @@ -0,0 +1,16 @@ +diff --git a/lib/console.c b/lib/console.c +index 2d421af..6e2a8ca 100644 +--- a/lib/console.c ++++ b/lib/console.c +@@ -521,7 +521,11 @@ static struct { + { EFI_SECURITY_VIOLATION, L"Security Violation"}, + + // warnings ++#ifdef EFI_WARN_UNKOWN_GLYPH + { EFI_WARN_UNKOWN_GLYPH, L"Warning Unknown Glyph"}, ++#else ++ { EFI_WARN_UNKNOWN_GLYPH, L"Warning Unknown Glyph"}, ++#endif + { 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"}, diff --git a/shim.changes b/shim.changes index cf1afe4..1431073 100644 --- a/shim.changes +++ b/shim.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 16 09:42:34 UTC 2020 - Gary Ching-Pang Lin + +- Add shim-fix-gnu-efi-3.0.11.patch to fix the build error caused + by the upgrade of gnu-efi + ------------------------------------------------------------------- Wed Nov 27 06:23:11 UTC 2019 - Michael Chang diff --git a/shim.spec b/shim.spec index 0028531..81c7e04 100644 --- a/shim.spec +++ b/shim.spec @@ -1,7 +1,7 @@ # # spec file for package shim # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -41,7 +41,7 @@ Release: 0 Summary: UEFI shim loader License: BSD-2-Clause Group: System/Boot -Url: https://github.com/rhboot/shim +URL: https://github.com/rhboot/shim Source: %{name}-%{version}.tar.bz2 # run "extract_signature.sh shim.efi" where shim.efi is the binary # with the signature from the UEFI signing service. @@ -73,6 +73,8 @@ Patch4: shim-always-mirror-mok-variables.patch Patch5: shim-correct-license-in-headers.patch # PATCH-FIX-UPSTREAM gcc9-fix-warnings.patch mliska@suse.cz -- MokManager: Use CompareMem on MokListNode.Type instead of CompareGuid Patch6: gcc9-fix-warnings.patch +# PATCH-FIX-OPENSUSE shim-fix-gnu-efi-3.0.11.patch glin@suse.com -- Fix the build error caused by the typo fix in gnu-efi 3.0.11 +Patch7: shim-fix-gnu-efi-3.0.11.patch # PATCH-FIX-OPENSUSE shim-opensuse-cert-prompt.patch glin@suse.com -- Show the prompt to ask whether the user trusts openSUSE certificate or not Patch100: shim-opensuse-cert-prompt.patch BuildRequires: gnu-efi >= 3.0.3 @@ -120,6 +122,7 @@ The source code of UEFI shim loader %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %if 0%{?is_opensuse} == 1 %patch100 -p1 %endif