fix for gnu-efi 3.0.8

Author: bluebat

Make.applets

@@ -54,7 +54,7 @@ LOADLIBES	+= $(LIBGCC) $(LIBEXTRA)
 LOADLIBES	+= -T $(LDSCRIPT)
 
 ifneq ($(HAVE_EFI_OBJCOPY),)
-  FORMAT	:= --target efi-app-$(ARCH)
+  FORMAT	:= --target efi-app-$(HOSTARCH)
 else
   SUBSYSTEM	:= 0xa
   FORMAT	:= -O binary

Make.defaults

@@ -77,7 +77,10 @@ endif
 
 # FreeBSD (and possibly others) reports amd64 instead of x86_64
 ifeq ($(ARCH),amd64)
-  override ARCH := x86_64
+  override ARCH := x64
+endif
+ifeq ($(ARCH),x86_64)
+  override ARCH := x64
 endif
 
 #
@@ -103,7 +106,7 @@ ifeq ($(ARCH),ia32)
   endif
 endif
 
-ifeq ($(ARCH),x86_64)
+ifeq ($(ARCH),x64)
   GCCVERSION   := $(shell $(CC) -dumpversion | cut -f1 -d.)
   GCCMINOR     := $(shell $(CC) -dumpversion | cut -f2 -d.)
   USING_CLANG  := $(shell $(CC) -v 2>&1 | grep -q 'clang version' && echo clang)

Makefile

@@ -1,4 +1,4 @@
-VERSION = 3.0.3
+VERSION = 3.0.8
 DESTDIR =
 PREFIX = /usr
 PACKAGE = gnu-efi-applets

README.md

@@ -7,7 +7,7 @@ Install & Usage
 	make
 	make install
 	cd MYPATH
-	$EDITOR MYAPPLETS.c
+	${EDITOR:-vi} MYAPPLETS.c
 	gnu-efi-applets-build MYAPPLETS.efi
 
 References

efilibc/data.c

@@ -100,12 +100,12 @@ EFI_GUID LoadFileProtocol         = LOAD_FILE_PROTOCOL;
 EFI_GUID DeviceIoProtocol         = DEVICE_IO_PROTOCOL;
 EFI_GUID UnicodeCollationProtocol = UNICODE_COLLATION_PROTOCOL;
 EFI_GUID SerialIoProtocol         = SERIAL_IO_PROTOCOL;
-EFI_GUID SimpleNetworkProtocol    = EFI_SIMPLE_NETWORK_PROTOCOL;
-EFI_GUID PxeBaseCodeProtocol      = EFI_PXE_BASE_CODE_PROTOCOL;
-EFI_GUID PxeCallbackProtocol      = EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL;
-EFI_GUID NetworkInterfaceIdentifierProtocol = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL;
+EFI_GUID SimpleNetworkProtocol    = EFI_SIMPLE_NETWORK_PROTOCOL_GUID;
+EFI_GUID PxeBaseCodeProtocol      = EFI_PXE_BASE_CODE_PROTOCOL_GUID;
+EFI_GUID PxeCallbackProtocol      = EFI_PXE_BASE_CODE_CALLBACK_PROTOCOL_GUID;
+EFI_GUID NetworkInterfaceIdentifierProtocol = EFI_NETWORK_INTERFACE_IDENTIFIER_PROTOCOL_GUID;
 EFI_GUID UiProtocol               = EFI_UI_PROTOCOL;
-EFI_GUID PciIoProtocol            = EFI_PCI_IO_PROTOCOL;
+EFI_GUID PciIoProtocol            = EFI_PCI_IO_PROTOCOL_GUID;
 EFI_GUID SimplePointerProtocol    = EFI_SIMPLE_POINTER_PROTOCOL_GUID;
 EFI_GUID AbsolutePointerProtocol  = EFI_ABSOLUTE_POINTER_PROTOCOL_GUID;
 

efilibc/string.c

@@ -77,7 +77,7 @@ int memcmp(const void *s1, const void *s2, size_t n)
 
 	return 0;
 }
-
+/*
 void *memset(void *s, int c, size_t n)
 {
 	while(n--)
@@ -91,7 +91,7 @@ void *memcpy(void *dest, const void *src, size_t n)
 		((uint8_t *)dest)[n] = ((uint8_t *)src)[n];
 	return dest;
 }
-
+*/
 size_t mbstowcs(wchar_t *dest, const char *src, size_t n)
 {
 	int conv = 0;

gnu-efi-applets.spec

@@ -1,8 +1,8 @@
 %global debug_package %{nil}
 
 Name:		gnu-efi-applets
-Version:	3.0.3
-Release:	3
+Version:	3.0.8
+Release:	5
 Summary:	Building Applets using GNU-EFI
 License:	GPL, PD, MIT
 Group:		Development/System
@@ -40,5 +40,5 @@ make DESTDIR=%{buildroot} install
 %{_includedir}/efilibc
 
 %changelog
-* Tue Sep 19 2017 Wei-Lun Chao <[email protected]> - 3.0.3
-- First release
+* Thu Jan 17 2019 Wei-Lun Chao <[email protected]> - 3.0.8
+- Rebuild for Fedora