[PATCH] Fix for gnu-efi > 3.0.18

5 views
Skip to first unread message

Storm, Christian

unread,
Oct 25, 2024, 8:40:16 AM10/25/24
to EFI Boot Guard
From: Christian Storm <christi...@siemens.com>

gnu-efi introduced some ABI changes for the upcoming 4.0 release, see
https://github.com/ncroxon/gnu-efi/blob/master/docs/README.ABI.md

For now, stick to the old API/ABI so to support older gnu-efi versions
without #ifdef'ing the codebase.

Signed-off-by: Christian Storm <christi...@siemens.com>
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index ab72c4e..21e2d0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,6 +221,7 @@ efi_cflags = \
-fno-stack-protector \
-Wsign-compare \
-DGNU_EFI_USE_MS_ABI \
+ -DGNU_EFI_3_0_COMPAT \
-Werror \
$(CFLAGS_MGENERAL_REGS_ONLY) \
$(CFLAGS)
--
2.47.0

Jan Kiszka

unread,
Oct 29, 2024, 3:41:14 AM10/29/24
to Storm, Christian, EFI Boot Guard
On 25.10.24 14:40, 'Storm, Christian' via EFI Boot Guard wrote:
> From: Christian Storm <christi...@siemens.com>
>
> gnu-efi introduced some ABI changes for the upcoming 4.0 release, see
> https://github.com/ncroxon/gnu-efi/blob/master/docs/README.ABI.md
>
> For now, stick to the old API/ABI so to support older gnu-efi versions
> without #ifdef'ing the codebase.
>

But this does not yet address [1], does it? If not, then the subject
should be more specific.

Thanks,
Jan

[1] https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/114

> Signed-off-by: Christian Storm <christi...@siemens.com>
> ---
> Makefile.am | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile.am b/Makefile.am
> index ab72c4e..21e2d0d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -221,6 +221,7 @@ efi_cflags = \
> -fno-stack-protector \
> -Wsign-compare \
> -DGNU_EFI_USE_MS_ABI \
> + -DGNU_EFI_3_0_COMPAT \
> -Werror \
> $(CFLAGS_MGENERAL_REGS_ONLY) \
> $(CFLAGS)


--
Siemens AG, Technology
Linux Expert Center

Storm, Christian

unread,
Oct 29, 2024, 4:33:12 AM10/29/24
to EFI Boot Guard
From: Christian Storm <christi...@siemens.com>

gnu-efi introduced some ABI changes for the upcoming 4.0 release, see
https://github.com/ncroxon/gnu-efi/blob/master/docs/README.ABI.md

For now, stick to the old API/ABI so to support older gnu-efi versions
without #ifdef'ing the codebase.

Signed-off-by: Christian Storm <christi...@siemens.com>
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index ab72c4e..21e2d0d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -221,6 +221,7 @@ efi_cflags = \
-fno-stack-protector \
-Wsign-compare \
-DGNU_EFI_USE_MS_ABI \
+ -DGNU_EFI_3_0_COMPAT \
-Werror \
$(CFLAGS_MGENERAL_REGS_ONLY) \
$(CFLAGS)
--
2.47.0

Storm, Christian

unread,
Oct 29, 2024, 4:34:50 AM10/29/24
to EFI Boot Guard
Hi Jan,

>> https://github.com/ncroxon/gnu-efi/blob/master/docs/README.ABI.md
>>
>> For now, stick to the old API/ABI so to support older gnu-efi versions
>> without #ifdef'ing the codebase.
>>
>
> But this does not yet address [1], does it?

No, this is totally unrelated to that, it's about the ABI change in the upcoming gnu-efi 4.0 release only.


> If not, then the subject should be more specific.

Sure, just send a new patch with a hopefully better subject :)


Kind regards,
Christian

--
Dr. Christian Storm
Siemens AG, FT RPD CED
Friedrich-Ludwig-Bauer-Str. 3, 85748 Garching, Germany

Jan Kiszka

unread,
Oct 29, 2024, 7:55:44 AM10/29/24
to Storm, Christian, EFI Boot Guard
Thanks, applied.

Jan
Reply all
Reply to author
Forward
0 new messages