232d61ad7e
- Update to 14 - Adjust make commands in spec - Drop upstreamed fixes - Add patches to avoid build failure - Update SUSE/openSUSE specific patches OBS-URL: https://build.opensuse.org/request/show/561561 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=135
57 lines
1.5 KiB
Diff
57 lines
1.5 KiB
Diff
From ffd90c3957fe8621e660d663b38b2eef8559c84a Mon Sep 17 00:00:00 2001
|
|
From: Gary Lin <glin@suse.com>
|
|
Date: Tue, 22 Aug 2017 12:43:36 +0800
|
|
Subject: [PATCH] Make the names of EFI binaries arch-independent
|
|
|
|
Since we only build the 64-bit binaries, we don't have the issue of the
|
|
mixed architecture binaries in the same directory. Besides, we will use
|
|
the same install script for x86_64 and AArch64. It's easier to maintain
|
|
the script with the same names.
|
|
|
|
Signed-off-by: Gary Lin <glin@suse.com>
|
|
---
|
|
fallback.c | 2 +-
|
|
shim.c | 6 +++---
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/fallback.c b/fallback.c
|
|
index 46894af..886e052 100644
|
|
--- a/fallback.c
|
|
+++ b/fallback.c
|
|
@@ -977,7 +977,7 @@ debug_hook(void)
|
|
|
|
x = 1;
|
|
Print(L"add-symbol-file "DEBUGDIR
|
|
- L"fb" EFI_ARCH L".efi.debug %p -s .data %p\n", &_etext,
|
|
+ L"fallback.efi.debug %p -s .data %p\n", &_etext,
|
|
&_edata);
|
|
}
|
|
|
|
diff --git a/shim.c b/shim.c
|
|
index aec9f8f..7b34868 100644
|
|
--- a/shim.c
|
|
+++ b/shim.c
|
|
@@ -50,8 +50,8 @@
|
|
|
|
#include <Library/BaseCryptLib.h>
|
|
|
|
-#define FALLBACK L"\\fb" EFI_ARCH L".efi"
|
|
-#define MOK_MANAGER L"\\mm" EFI_ARCH L".efi"
|
|
+#define FALLBACK L"\\fallback.efi"
|
|
+#define MOK_MANAGER L"\\MokManager.efi"
|
|
|
|
#define OID_EKU_MODSIGN "1.3.6.1.4.1.2312.16.1.2"
|
|
|
|
@@ -2852,7 +2852,7 @@ debug_hook(void)
|
|
}
|
|
|
|
Print(L"add-symbol-file "DEBUGDIR
|
|
- L"shim" EFI_ARCH L".efi.debug 0x%08x -s .data 0x%08x\n", &_text,
|
|
+ L"shim.efi.debug 0x%08x -s .data 0x%08x\n", &_text,
|
|
&_data);
|
|
|
|
Print(L"Pausing for debugger attachment.\n");
|
|
--
|
|
2.15.1
|
|
|