From 927d98bacff515fdbac1ba13c6ca655385f3d6a7 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>
---
 Makefile   | 9 ---------
 fallback.c | 2 +-
 shim.c     | 6 +++---
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 6ece282..d518615 100644
--- a/Makefile
+++ b/Makefile
@@ -51,9 +51,6 @@ ifeq ($(ARCH),x86_64)
 		-DNO_BUILTIN_VA_FUNCS \
 		-DMDE_CPU_X64 "-DEFI_ARCH=L\"x64\"" -DPAGE_SIZE=4096 \
 		"-DDEBUGDIR=L\"/usr/lib/debug/usr/share/shim/x64-$(VERSION)$(RELEASE)/\""
-	MMNAME	= mmx64
-	FBNAME	= fbx64
-	SHIMNAME= shimx64
 	EFI_PATH:=/usr/lib64/gnuefi
 	LIB_PATH:=/usr/lib64
 
@@ -63,18 +60,12 @@ ifeq ($(ARCH),ia32)
 		-maccumulate-outgoing-args -m32 \
 		-DMDE_CPU_IA32 "-DEFI_ARCH=L\"ia32\"" -DPAGE_SIZE=4096 \
 		"-DDEBUGDIR=L\"/usr/lib/debug/usr/share/shim/ia32-$(VERSION)$(RELEASE)/\""
-	MMNAME	= mmia32
-	FBNAME	= fbia32
-	SHIMNAME= shimia32
 	EFI_PATH:=/usr/lib/gnuefi
 	LIB_PATH:=/usr/lib
 endif
 ifeq ($(ARCH),aarch64)
 	CFLAGS += -DMDE_CPU_AARCH64 "-DEFI_ARCH=L\"aa64\"" -DPAGE_SIZE=4096 \
 		"-DDEBUGDIR=L\"/usr/lib/debug/usr/share/shim/aa64-$(VERSION)$(RELEASE)/\""
-	MMNAME	= mmaa64
-	FBNAME	= fbaa64
-	SHIMNAME= shimaa64
 	EFI_PATH:=/usr/lib64/gnuefi
 	LIB_PATH:=/usr/lib64
 endif
diff --git a/fallback.c b/fallback.c
index 5e4a396..c80652a 100644
--- a/fallback.c
+++ b/fallback.c
@@ -835,7 +835,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 f8a1e67..48c8797 100644
--- a/shim.c
+++ b/shim.c
@@ -56,8 +56,8 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.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"
 
@@ -2671,7 +2671,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.14.0