pool/shim
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add shim-fix-gnu-efi-3.0.11.patch to fix the build error caused

Browse Source 
by the upgrade of gnu-efi

OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=155
This commit is contained in:
Gary Ching-Pang Lin 2020-03-16 09:43:20 +00:00 committed by Git OBS Bridge
parent 7ef93b059a
commit e0cafca96d
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shim-fix-gnu-efi-3.0.11.patch Normal file
View File

@ -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"},

6
shim.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 16 09:42:34 UTC 2020 - Gary Ching-Pang Lin <glin@suse.com>
- 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 <mchang@suse.com> Wed Nov 27 06:23:11 UTC 2019 - Michael Chang <mchang@suse.com>

7
shim.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package shim # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -41,7 +41,7 @@ Release: 0
Summary: UEFI shim loader Summary: UEFI shim loader
License: BSD-2-Clause License: BSD-2-Clause
Group: System/Boot Group: System/Boot
Url: https://github.com/rhboot/shim URL: https://github.com/rhboot/shim
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
# run "extract_signature.sh shim.efi" where shim.efi is the binary # run "extract_signature.sh shim.efi" where shim.efi is the binary
# with the signature from the UEFI signing service. # 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 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 # PATCH-FIX-UPSTREAM gcc9-fix-warnings.patch mliska@suse.cz -- MokManager: Use CompareMem on MokListNode.Type instead of CompareGuid
Patch6: gcc9-fix-warnings.patch 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 # 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 Patch100: shim-opensuse-cert-prompt.patch
BuildRequires: gnu-efi >= 3.0.3 BuildRequires: gnu-efi >= 3.0.3
@ -120,6 +122,7 @@ The source code of UEFI shim loader
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
%if 0%{?is_opensuse} == 1 %if 0%{?is_opensuse} == 1
%patch100 -p1 %patch100 -p1
%endif %endif