diff --git a/0001-Make-gnuefi-build-and-install-right.patch b/0001-Make-gnuefi-build-and-install-right.patch index 6be94b5..b179ffd 100644 --- a/0001-Make-gnuefi-build-and-install-right.patch +++ b/0001-Make-gnuefi-build-and-install-right.patch @@ -11,14 +11,14 @@ stuff on the fly. Signed-off-by: Peter Jones --- - gnu-efi-3.0/gnuefi/Makefile | 34 ++++++++++++---------------------- - gnu-efi-3.0/inc/Makefile | 36 +++++++++++------------------------- + gnuefi/Makefile | 34 ++++++++++++---------------------- + inc/Makefile | 36 +++++++++++------------------------- 2 files changed, 23 insertions(+), 47 deletions(-) -diff --git a/gnu-efi-3.0/gnuefi/Makefile b/gnu-efi-3.0/gnuefi/Makefile +diff --git a/gnuefi/Makefile b/gnuefi/Makefile index 4717227..d234ac0 100644 ---- a/gnu-efi-3.0/gnuefi/Makefile -+++ b/gnu-efi-3.0/gnuefi/Makefile +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile @@ -52,19 +52,6 @@ reloc_aarch64.o: CFLAGS += -fno-jump-tables TARGETS = crt0-efi-$(ARCH).o libgnuefi.a @@ -66,10 +66,10 @@ index 4717227..d234ac0 100644 +endif include $(SRCDIR)/../Make.rules -diff --git a/gnu-efi-3.0/inc/Makefile b/gnu-efi-3.0/inc/Makefile +diff --git a/inc/Makefile b/inc/Makefile index 526af22..71fded5 100644 ---- a/gnu-efi-3.0/inc/Makefile -+++ b/gnu-efi-3.0/inc/Makefile +--- a/inc/Makefile ++++ b/inc/Makefile @@ -8,34 +8,20 @@ TOPDIR = $(SRCDIR)/.. CDIR=$(TOPDIR)/.. diff --git a/0002-Make-command-lines-work-with-FreeBSD-s-objcopy-versi.patch b/0002-Make-command-lines-work-with-FreeBSD-s-objcopy-versi.patch index bdf86d5..1bf50eb 100644 --- a/0002-Make-command-lines-work-with-FreeBSD-s-objcopy-versi.patch +++ b/0002-Make-command-lines-work-with-FreeBSD-s-objcopy-versi.patch @@ -9,14 +9,14 @@ include non-globbed versions of .rel/.rela individually. Signed-off-by: Peter Jones Signed-Off-By: Bill Paul --- - gnu-efi-3.0/Make.defaults | 7 +++++++ - gnu-efi-3.0/Make.rules | 5 +++-- + Make.defaults | 7 +++++++ + Make.rules | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) -diff --git a/gnu-efi-3.0/Make.defaults b/gnu-efi-3.0/Make.defaults +diff --git a/Make.defaults b/Make.defaults index 807205d..169273d 100644 ---- a/gnu-efi-3.0/Make.defaults -+++ b/gnu-efi-3.0/Make.defaults +--- a/Make.defaults ++++ b/Make.defaults @@ -133,8 +133,15 @@ endif # Generic compilation flags INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ @@ -33,10 +33,10 @@ index 807205d..169273d 100644 + ASFLAGS += $(ARCH3264) LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings -diff --git a/gnu-efi-3.0/Make.rules b/gnu-efi-3.0/Make.rules +diff --git a/Make.rules b/Make.rules index 7113b3e..02c7088 100644 ---- a/gnu-efi-3.0/Make.rules -+++ b/gnu-efi-3.0/Make.rules +--- a/Make.rules ++++ b/Make.rules @@ -35,8 +35,9 @@ # diff --git a/0003-Add-the-capsule-API.patch b/0003-Add-the-capsule-API.patch index 0b3b4e2..649681d 100644 --- a/0003-Add-the-capsule-API.patch +++ b/0003-Add-the-capsule-API.patch @@ -5,13 +5,13 @@ Subject: [PATCH 3/5] Add the capsule API Signed-off-by: Peter Jones --- - gnu-efi-3.0/inc/efiapi.h | 38 ++++++++++++++++++++++++++++++++++++++ + inc/efiapi.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) -diff --git a/gnu-efi-3.0/inc/efiapi.h b/gnu-efi-3.0/inc/efiapi.h +diff --git a/inc/efiapi.h b/inc/efiapi.h index 2ab9f1f..a3e3fd9 100644 ---- a/gnu-efi-3.0/inc/efiapi.h -+++ b/gnu-efi-3.0/inc/efiapi.h +--- a/inc/efiapi.h ++++ b/inc/efiapi.h @@ -585,6 +585,42 @@ EFI_STATUS OUT UINT32 *HighCount ); diff --git a/0004-Add-the-QueryVariableInfo-API.patch b/0004-Add-the-QueryVariableInfo-API.patch index 9b7b4be..cdc3b83 100644 --- a/0004-Add-the-QueryVariableInfo-API.patch +++ b/0004-Add-the-QueryVariableInfo-API.patch @@ -5,13 +5,13 @@ Subject: [PATCH 4/5] Add the QueryVariableInfo() API. Signed-off-by: Peter Jones --- - gnu-efi-3.0/inc/efiapi.h | 10 ++++++++++ + inc/efiapi.h | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/gnu-efi-3.0/inc/efiapi.h b/gnu-efi-3.0/inc/efiapi.h +diff --git a/inc/efiapi.h b/inc/efiapi.h index a3e3fd9..708c67f 100644 ---- a/gnu-efi-3.0/inc/efiapi.h -+++ b/gnu-efi-3.0/inc/efiapi.h +--- a/inc/efiapi.h ++++ b/inc/efiapi.h @@ -621,6 +621,15 @@ EFI_STATUS OUT EFI_RESET_TYPE *ResetType ); diff --git a/0005-Add-current-OsIndications-values.patch b/0005-Add-current-OsIndications-values.patch index 69b4f94..7a70e7f 100644 --- a/0005-Add-current-OsIndications-values.patch +++ b/0005-Add-current-OsIndications-values.patch @@ -5,13 +5,13 @@ Subject: [PATCH 5/5] Add current OsIndications values. Signed-off-by: Peter Jones --- - gnu-efi-3.0/inc/efidef.h | 9 +++++++++ + inc/efidef.h | 9 +++++++++ 1 file changed, 9 insertions(+) -diff --git a/gnu-efi-3.0/inc/efidef.h b/gnu-efi-3.0/inc/efidef.h +diff --git a/inc/efidef.h b/inc/efidef.h index 666b193..8b70051 100644 ---- a/gnu-efi-3.0/inc/efidef.h -+++ b/gnu-efi-3.0/inc/efidef.h +--- a/inc/efidef.h ++++ b/inc/efidef.h @@ -208,4 +208,13 @@ typedef UINT8 ISO_639_2; #define EFI_SIZE_TO_PAGES(a) \ ( ((a) >> EFI_PAGE_SHIFT) + ((a) & EFI_PAGE_MASK ? 1 : 0) )