Accepting request 503346 from home:gary_lin:branches:Base:System

Fix the declaration of EFI_PXE_BASE_CODE

OBS-URL: https://build.opensuse.org/request/show/503346
OBS-URL: https://build.opensuse.org/package/show/Base:System/gnu-efi?expand=0&rev=25

gnu-efi-fix-efi-pxe-base-code.patch

@@ -0,0 +1,37 @@
+From 97fe9c9eddb753c4e44accc0656822ff6a60bcb9 Mon Sep 17 00:00:00 2001
+From: Gary Lin <glin@suse.com>
+Date: Tue, 13 Jun 2017 16:39:17 +0800
+Subject: [PATCH] Fix EFI_PXE_BASE_CODE declaration
+
+Declare EFI_PXE_BASE_CODE correctly
+
+EFI_PXE_BASE_CODE was redefined in the early commit(*) to match the
+definition in EDK2. However, EFI_PXE_BASE_CODE wasn't declared
+correctly. Since EFI_PXE_BASE_CODE_PROTOCOL is already an alias of
+"struct _EFI_PXE_BASE_CODE_PROTOCOL", the additional struct in front of
+EFI_PXE_BASE_CODE_PROTOCOL actually confused the compiler and caused
+build fail. Remove the redundant struct to avoid confusion.
+
+*751cbce3f640c7 Update global protocol GUIDs definitions to match EDK2
+
+Signed-off-by: Gary Lin <glin@suse.com>
+---
+ inc/efipxebc.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/efipxebc.h b/inc/efipxebc.h
+index 580a6ef..035a853 100644
+--- a/inc/efipxebc.h
++++ b/inc/efipxebc.h
+@@ -419,7 +419,7 @@ typedef struct _EFI_PXE_BASE_CODE_PROTOCOL {
+ // Use 'EFI_PXE_BASE_CODE_PROTOCOL_GUID' instead.
+ 
+ typedef struct _EFI_PXE_BASE_CODE_PROTOCOL _EFI_PXE_BASE_CODE;
+-typedef struct EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
++typedef EFI_PXE_BASE_CODE_PROTOCOL EFI_PXE_BASE_CODE;
+ 
+ //
+ // Call Back Definitions
+-- 
+2.13.1
+

gnu-efi.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 13 08:49:16 UTC 2017 - glin@suse.com
+
+- Add gnu-efi-fix-efi-pxe-base-code.patch to fix the declaration
+  of EFI_PXE_BASE_CODE
+
 -------------------------------------------------------------------
 Fri Jun  2 01:55:41 UTC 2017 - glin@suse.com
 

gnu-efi.spec

@@ -27,6 +27,7 @@ Source:         http://sourceforge.net/projects/gnu-efi/files/gnu-efi-%{version}
 Source1:        %{name}-rpmlintrc
 Patch1:         gnu-efi-fix-switch-warning.patch
 Patch2:         gnu-efi-ar-stable-order.patch
+Patch3:         gnu-efi-fix-efi-pxe-base-code.patch
 BuildRequires:  kernel-source
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  ia64 %ix86 x86_64 aarch64 %arm
@@ -40,6 +41,7 @@ environment.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 ##########################