Skip to contentSkip to conversation

syslinux and gnu-efi fixes and update

PATCH In review Thomas Petazzoni via buildroot 4 participants 12 messages Jan 19, 2025 – Jan 31, 2025

lore
Share & tools
lore
#0 lore raw

cover syslinux and gnu-efi fixes and update

Hello,

The starting point of this series was fixing gnu-efi build failures reported in the autobuilders, which PATCH 3/4 addresses. While doing this, I noticed that gnu-efi would benefit from a bump, which is done in PATCH 4/4. In turn, while doing this, I noticed that syslinux was failing to build for EFI targets with recent GCC versions, which is addressed in PATCH 2/4. And in turn, this made me realize that the current runtime tests for syslinux use a fixed version of the external toolchain, which is why we didn't catch that newer GCC versions break the syslinux build, so PATCH 1/4 changes those tests to use the latest Bootlin toolchain.

Best regards,

Thomas

Thomas Petazzoni (4):
support/testing/tests/boot/test_syslinux: use newer toolchains boot/syslinux: add multiple patches fixing build issues with GCC >= 14 package/gnu-efi: fix build due to short-wchar package/gnu-efi: change upstream, bump to 4.0.0

 .../0021-load_linux-correct-a-type.patch      | 34 +++++++++++++
 ...echn.c-use-proper-type-in-struct-dat.patch | 46 ++++++++++++++++++
 ...n.h-use-proper-type-in-struct-data_a.patch | 42 ++++++++++++++++
 ...fix-incorrect-type-of-load_error_buf.patch | 48 +++++++++++++++++++
 ...n-t-override-ARCH-when-cross-compili.patch |  8 ++--
 package/gnu-efi/Config.in                     |  2 +-
 package/gnu-efi/gnu-efi.hash                  |  5 +-
 package/gnu-efi/gnu-efi.mk                    |  5 +-
 support/testing/tests/boot/test_syslinux.py   | 17 +------
 9 files changed, 180 insertions(+), 27 deletions(-)
 create mode 100644 boot/syslinux/0021-load_linux-correct-a-type.patch
 create mode 100644 boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch
 create mode 100644 boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch
 create mode 100644 boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch
Signature · 6 lines
2.47.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

PATCH 1/4 support/testing/tests/boot/test_syslinux: use newer toolchains

---
 support/testing/tests/boot/test_syslinux.py | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)
support/testing/tests/boot/test_syslinux.py +2 -15
index 467d564e18..41152cde7e 100644
@@ -6,13 +6,7 @@ class TestSysLinuxBase(infra.basetest.BRTest):
         """
         BR2_x86_i686=y
         BR2_TOOLCHAIN_EXTERNAL=y
-        BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-        BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-        BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-i686/tarballs/x86-i686--glibc--bleeding-edge-2018.11-1.tar.bz2"
-        BR2_TOOLCHAIN_EXTERNAL_GCC_8=y
-        BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_14=y
-        BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
-        BR2_TOOLCHAIN_EXTERNAL_CXX=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_I686_GLIBC_BLEEDING_EDGE=y
         """
 
     x86_64_toolchain_config = \
@@ -20,14 +14,7 @@ class TestSysLinuxBase(infra.basetest.BRTest):
         BR2_x86_64=y
         BR2_x86_corei7=y
         BR2_TOOLCHAIN_EXTERNAL=y
-        BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
-        BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
-        BR2_TOOLCHAIN_EXTERNAL_URL="http://toolchains.bootlin.com/downloads/releases/toolchains/x86-64-core-i7/tarballs/x86-64-core-i7--glibc--stable-2018.11-1.tar.bz2"
-        BR2_TOOLCHAIN_EXTERNAL_GCC_7=y
-        BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_1=y
-        BR2_TOOLCHAIN_EXTERNAL_CXX=y
-        BR2_TOOLCHAIN_EXTERNAL_HAS_SSP=y
-        BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y
+        BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y
         """
 
     syslinux_legacy_config = \
Signature · 6 lines
2.47.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw

PATCH 2/4 boot/syslinux: add multiple patches fixing build issues with GCC >= 14

In reply to Thomas Petazzoni via buildroot

No autobuilder failures reported, but it fixes build issues that can be reproduced with:

BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y BR2_TARGET_SYSLINUX=y
BR2_TARGET_SYSLINUX_EFI=y

First patch is backported from upstream. Last 3 patches are not from upstream, and they have not been submitted as upstream is basically dead (last release 10 years ago, last commit 5 years ago).

---
 .../0021-load_linux-correct-a-type.patch      | 34 +++++++++++++
 ...echn.c-use-proper-type-in-struct-dat.patch | 46 ++++++++++++++++++
 ...n.h-use-proper-type-in-struct-data_a.patch | 42 ++++++++++++++++
 ...fix-incorrect-type-of-load_error_buf.patch | 48 +++++++++++++++++++
 4 files changed, 170 insertions(+)
 create mode 100644 boot/syslinux/0021-load_linux-correct-a-type.patch
 create mode 100644 boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch
 create mode 100644 boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch
 create mode 100644 boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch
boot/syslinux/0021-load_linux-correct-a-type.patch new file +34 -0
new file mode 100644
index 0000000000..ff4e5a2d29
@@ -0,0 +1,34 @@
+From 7f1b68d561dfe615d5cd73d2f4561ac032832802 Mon Sep 17 00:00:00 2001
+From: Scot Doyle <[email protected]>
+Date: Sat, 7 Feb 2015 13:52:05 -0500
+Subject: [PATCH] load_linux: correct a type
+
+Correct base's type to match its initialization from prot_mode_base and
+passage to syslinux_memmap_find(). Tested with extlinux.
+
+Signed-off-by: Scot Doyle <[email protected]>
+Signed-off-by: Gene Cumm <[email protected]>
+Upstream: https://github.com/geneC/syslinux/commit/83aad4f69065509ba5b1c080edccfed316a4cff0
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ com32/lib/syslinux/load_linux.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/com32/lib/syslinux/load_linux.c b/com32/lib/syslinux/load_linux.c
+index 06ae2a97..ac737293 100644
+--- a/com32/lib/syslinux/load_linux.c
++++ b/com32/lib/syslinux/load_linux.c
+@@ -155,8 +155,8 @@ int bios_boot_linux(void *kernel_buf, size_t kernel_size,
+ 		    char *cmdline)
+ {
+     struct linux_header hdr, *whdr;
+-    size_t real_mode_size, prot_mode_size, base;
+-    addr_t real_mode_base, prot_mode_base, prot_mode_max;
++    size_t real_mode_size, prot_mode_size;
++    addr_t real_mode_base, prot_mode_base, prot_mode_max, base;
+     addr_t irf_size;
+     size_t cmdline_size, cmdline_offset;
+     struct setup_data *sdp;
+-- 
+2.47.1
+
boot/syslinux/0022-com32-modules-pxechn.c-use-proper-type-in-struct-dat.patch new file +46 -0

46 lines not on this page · raw message

boot/syslinux/0023-com32-chain-chain.h-use-proper-type-in-struct-data_a.patch new file +42 -0

42 lines not on this page · raw message

boot/syslinux/0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch new file +48 -0

48 lines not on this page · raw message

Signature · 6 lines
2.47.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#4 lore raw

Re: [Buildroot] [PATCH 2/4] boot/syslinux: add multiple patches fixing build issues with GCC >= 14

Quoted 10 lines · Thomas Petazzoni via buildroot

No autobuilder failures reported, but it fixes build issues that can be reproduced with:

BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y BR2_TARGET_SYSLINUX=y
BR2_TARGET_SYSLINUX_EFI=y

Quoted 5 lines

First patch is backported from upstream. Last 3 patches are not from upstream, and they have not been submitted as upstream is basically dead (last release 10 years ago, last commit 5 years ago).

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#5 lore raw

Re: [Buildroot] [PATCH 2/4] boot/syslinux: add multiple patches fixing build issues with GCC >= 14

In reply to Thomas Petazzoni via buildroot
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni via buildroot <[email protected]> writes:

No autobuilder failures reported, but it fixes build issues that can be reproduced with:

BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y BR2_TARGET_SYSLINUX=y
BR2_TARGET_SYSLINUX_EFI=y

Quoted 5 lines

First patch is backported from upstream. Last 3 patches are not from upstream, and they have not been submitted as upstream is basically dead (last release 10 years ago, last commit 5 years ago).

Committed to 2024.11.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#6 lore raw

PATCH 3/4 package/gnu-efi: fix build due to short-wchar

In reply to Thomas Petazzoni via buildroot

The gnu-efi code base is so far built with -fshort-wchar:

‘-fshort-wchar’
Override the underlying type for ‘wchar_t’ to be ‘short unsigned int’ instead of the default for the target. This option is useful for building programs to run under WINE.

*Warning:* the ‘-fshort-wchar’ switch causes GCC to generate code that is not binary compatible with code generated without that switch. Use it to conform to a non-default application binary interface.

However, this is highly incompatible with the definitions of wchar_t by musl, causing build issues:

/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: error: passing argument 2 of 'ConOut->OutputString' from incompatible pointer type [-Werror=incompatible-pointer-types] [...]
/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: note: expected 'CHAR16 *' {aka 'int *'} but argument is of type 'short unsigned int *'

These have been addressed upstream by simply not using -fshort-wchar anymore, so we backport the relevant patches.

The patch 0003-Use-char16_t-literals.patch was directly backported, it was "redone" (it's a very mechanical patch) as backporting the patch and fixing the conflicts was more effort than redoing the patch from scratch. But in essence, it is the same patch as what is upstream.

Fixes:

http://autobuild.buildroot.net/results/8b2f5b38284e70dde8c5619e5050e7f201a0bcc3/

---
 .../0002-Make-CHAR16-use-uint16_t.patch       |  164 ++
 .../gnu-efi/0003-Use-char16_t-literals.patch  | 2103 +++++++++++++++++
 2 files changed, 2267 insertions(+)
 create mode 100644 package/gnu-efi/0002-Make-CHAR16-use-uint16_t.patch
 create mode 100644 package/gnu-efi/0003-Use-char16_t-literals.patch
package/gnu-efi/0002-Make-CHAR16-use-uint16_t.patch new file +164 -0
new file mode 100644
index 0000000000..36a2ea2a8e
@@ -0,0 +1,164 @@
+From f65e5db5666529abb18fe24f5c45331404a1ce99 Mon Sep 17 00:00:00 2001
+From: Callum Farmer <[email protected]>
+Date: Wed, 29 May 2024 16:22:50 +0100
+Subject: [PATCH] Make CHAR16 use uint16_t
+
+musl-libc doesn't like fshort-wchar so remove wchar_t usage
+Use uint16_t as char16_t can be up to 32bits
+Fixes ncroxon/gnu-efi#16
+
+Signed-off-by: Callum Farmer <[email protected]>
+Upstream: https://github.com/ncroxon/gnu-efi/commit/edfda7c396134c7109444b230ce4b0da1e61d524
+Signed-off-by: Thomas Petazzoni <[email protected]>
+---
+ Make.defaults             | 4 ++--
+ inc/aarch64/efibind.h     | 2 +-
+ inc/arm/efibind.h         | 2 +-
+ inc/ia32/efibind.h        | 2 +-
+ inc/ia64/efibind.h        | 2 +-
+ inc/loongarch64/efibind.h | 2 +-
+ inc/mips64el/efibind.h    | 2 +-
+ inc/riscv64/efibind.h     | 5 ++---
+ inc/x86_64/efibind.h      | 2 +-
+ 9 files changed, 11 insertions(+), 12 deletions(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index c9f9b4f..83204a6 100755
+--- a/Make.defaults
++++ b/Make.defaults
+@@ -187,11 +187,11 @@ endif
+ 
+ ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
+ CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
+-           -funsigned-char -fshort-wchar -fno-strict-aliasing \
++           -funsigned-char -fno-strict-aliasing \
+            -ffreestanding -fno-stack-protector
+ else
+ CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \
+-           -funsigned-char -fshort-wchar -fno-strict-aliasing \
++           -funsigned-char -fno-strict-aliasing \
+ 	   -ffreestanding -fno-stack-protector -fno-stack-check \
+            $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,)
+ endif
+diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h
+index d6b5d0f..1a1fb79 100644
+--- a/inc/aarch64/efibind.h
++++ b/inc/aarch64/efibind.h
+@@ -40,7 +40,7 @@ typedef int64_t             intptr_t;
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h
+index 8c578df..bc43931 100644
+--- a/inc/arm/efibind.h
++++ b/inc/arm/efibind.h
+@@ -48,7 +48,7 @@ typedef int32_t             intptr_t;
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h
+index 718e8d1..1b33f2f 100644
+--- a/inc/ia32/efibind.h
++++ b/inc/ia32/efibind.h
+@@ -87,7 +87,7 @@ Revision History
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ 
+diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h
+index 1d2745b..1ad41f8 100644
+--- a/inc/ia64/efibind.h
++++ b/inc/ia64/efibind.h
+@@ -74,7 +74,7 @@ Revision History
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+diff --git a/inc/loongarch64/efibind.h b/inc/loongarch64/efibind.h
+index 8ed83a5..806209d 100644
+--- a/inc/loongarch64/efibind.h
++++ b/inc/loongarch64/efibind.h
+@@ -44,7 +44,7 @@ typedef int64_t             intptr_t;
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h
+index cf77ddc..9b396cc 100644
+--- a/inc/mips64el/efibind.h
++++ b/inc/mips64el/efibind.h
+@@ -42,7 +42,7 @@ typedef int64_t             intptr_t;
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
+index d8b4f39..b6d418c 100644
+--- a/inc/riscv64/efibind.h
++++ b/inc/riscv64/efibind.h
+@@ -17,13 +17,12 @@
+  */
+ 
+ #include <stdint.h>
++#include <stddef.h>
+ 
+ //
+ // Basic EFI types of various widths
+ //
+ 
+-#include <stddef.h>
+-
+ typedef uint64_t                UINT64;
+ typedef int64_t                 INT64;
+ typedef uint32_t                UINT32;
+@@ -33,7 +32,7 @@ typedef int16_t                 INT16;
+ typedef uint8_t                 UINT8;
+ typedef int8_t                  INT8;
+ typedef char                    CHAR8;
+-typedef wchar_t                 CHAR16;
++typedef uint16_t                 CHAR16;
+ #define WCHAR                   CHAR16
+ #undef VOID
+ typedef void                    VOID;
+diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h
+index e454ed2..8f431cb 100644
+--- a/inc/x86_64/efibind.h
++++ b/inc/x86_64/efibind.h
+@@ -98,7 +98,7 @@ Revision History
+ 
+ #include <stddef.h>
+ 
+-typedef wchar_t CHAR16;
++typedef uint16_t CHAR16;
+ #define WCHAR CHAR16
+ 
+ typedef uint64_t   UINT64;
+-- 
+2.47.1
+
package/gnu-efi/0003-Use-char16_t-literals.patch new file +2103 -0

2,103 lines not on this page · raw message

Signature · 6 lines
2.47.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#7 lore raw

Re: [Buildroot] [PATCH 3/4] package/gnu-efi: fix build due to short-wchar

Quoted 27 lines · Thomas Petazzoni via buildroot

The gnu-efi code base is so far built with -fshort-wchar:

‘-fshort-wchar’
Override the underlying type for ‘wchar_t’ to be ‘short unsigned int’ instead of the default for the target. This option is useful for building programs to run under WINE.

*Warning:* the ‘-fshort-wchar’ switch causes GCC to generate code that is not binary compatible with code generated without that switch. Use it to conform to a non-default application binary interface.

However, this is highly incompatible with the definitions of wchar_t by musl, causing build issues:

/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: error: passing argument 2 of 'ConOut->OutputString' from incompatible pointer type [-Werror=incompatible-pointer-types] [...]
/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: note: expected 'CHAR16 *' {aka 'int *'} but argument is of type 'short unsigned int *'

These have been addressed upstream by simply not using -fshort-wchar anymore, so we backport the relevant patches.

The patch 0003-Use-char16_t-literals.patch was directly backported, it was "redone" (it's a very mechanical patch) as backporting the patch and fixing the conflicts was more effort than redoing the patch from scratch. But in essence, it is the same patch as what is upstream.

Quoted 6 lines

Fixes:

http://autobuild.buildroot.net/results/8b2f5b38284e70dde8c5619e5050e7f201a0bcc3/

Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#8 lore raw

Re: [Buildroot] [PATCH 3/4] package/gnu-efi: fix build due to short-wchar

In reply to Thomas Petazzoni via buildroot
Quoted 28 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni via buildroot <[email protected]> writes:

The gnu-efi code base is so far built with -fshort-wchar:
‘-fshort-wchar’
Override the underlying type for ‘wchar_t’ to be ‘short unsigned int’ instead of the default for the target. This option is useful for building programs to run under WINE.

*Warning:* the ‘-fshort-wchar’ switch causes GCC to generate code that is not binary compatible with code generated without that switch. Use it to conform to a non-default application binary interface.

However, this is highly incompatible with the definitions of wchar_t by musl, causing build issues:

/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: error: passing argument 2 of 'ConOut->OutputString' from incompatible pointer type [-Werror=incompatible-pointer-types] [...]
/workdir/instance-0/output-1/build/gnu-efi-3.0.18//lib/console.c:84:68: note: expected 'CHAR16 *' {aka 'int *'} but argument is of type 'short unsigned int *'

These have been addressed upstream by simply not using -fshort-wchar anymore, so we backport the relevant patches.

The patch 0003-Use-char16_t-literals.patch was directly backported, it was "redone" (it's a very mechanical patch) as backporting the patch and fixing the conflicts was more effort than redoing the patch from scratch. But in essence, it is the same patch as what is upstream.

Quoted 5 lines

Fixes:

http://autobuild.buildroot.net/results/8b2f5b38284e70dde8c5619e5050e7f201a0bcc3/

Committed to 2024.11.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#9 lore raw

PATCH 4/4 package/gnu-efi: change upstream, bump to 4.0.0

In reply to Thomas Petazzoni via buildroot

https://sourceforge.net/projects/gnu-efi/ is dead and stuck at version 3.0.18. At https://sourceforge.net/p/gnu-efi/feature-requests/11/ the upstream maintainer has indicated that the project is now maintained at https://github.com/ncroxon/gnu-efi/, so let's use this as upstream.

We can drop patches 0002 and 0003 since they are upstream. Patch 0001 is just slightly refreshed.

Changes 3.0.18 -> 3.0.19:
https://github.com/ncroxon/gnu-efi/releases/tag/3.0.19

Changes 3.0.19 -> 4.0.0:
https://github.com/ncroxon/gnu-efi/releases/tag/4.0.0

Tested with the following defconfigs:

ARM defconfig testing gnu-efi + fwupd-efi

BR2_arm=y
BR2_cortex_a9=y
BR2_ARM_ENABLE_VFP=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_ARMV7_EABIHF_MUSL_STABLE=y BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_FWUPD_EFI=y
# BR2_TARGET_ROOTFS_TAR is not set

RISC-V defconfig testing gnu-efi + fwupd-efi

BR2_riscv=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_RISCV64_LP64D_MUSL_STABLE=y BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_FWUPD_EFI=y
# BR2_TARGET_ROOTFS_TAR is not set

x86-64 defconfig testing gnu-efi + fwupd-efi + systemd-boot

BR2_x86_64=y
BR2_x86_corei7=y
BR2_TOOLCHAIN_EXTERNAL=y BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_X86_64_CORE_I7_GLIBC_BLEEDING_EDGE=y BR2_INIT_SYSTEMD=y
BR2_SYSTEM_BIN_SH_NONE=y BR2_SYSTEM_DEFAULT_PATH="/bin:/sbin:/usr/bin:/usr/sbin" # BR2_PACKAGE_BUSYBOX is not set BR2_PACKAGE_SYSTEMD_BOOT=y
# BR2_TARGET_ROOTFS_TAR is not set
BR2_TARGET_SYSLINUX=y
BR2_TARGET_SYSLINUX_EFI=y

---
 ...n-t-override-ARCH-when-cross-compili.patch |    8 +-
 .../0002-Make-CHAR16-use-uint16_t.patch       |  164 --
 .../gnu-efi/0003-Use-char16_t-literals.patch  | 2103 -----------------
 package/gnu-efi/Config.in                     |    2 +-
 package/gnu-efi/gnu-efi.hash                  |    5 +-
 package/gnu-efi/gnu-efi.mk                    |    5 +-
 6 files changed, 8 insertions(+), 2279 deletions(-)
 delete mode 100644 package/gnu-efi/0002-Make-CHAR16-use-uint16_t.patch
 delete mode 100644 package/gnu-efi/0003-Use-char16_t-literals.patch
package/gnu-efi/0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch +4 -4
index 2eb9c5a062..cbba80b00a 100644
@@ -1,4 +1,4 @@
-From b2dbeec5063265eb0121342c24a900a4888712a7 Mon Sep 17 00:00:00 2001
+From 893a75202407e8ff3d75b217813a5df87da7c807 Mon Sep 17 00:00:00 2001
 From: Fabrice Fontaine <[email protected]>
 Date: Sun, 20 Jan 2019 21:07:11 +0100
 Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling
@@ -15,10 +15,10 @@ Signed-off-by: Fabrice Fontaine <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Make.defaults b/Make.defaults
-index 47ed361..7420344 100755
+index 1347aca..bb21874 100755
 --- a/Make.defaults
 +++ b/Make.defaults
-@@ -67,7 +67,7 @@ ARCH         ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678
+@@ -99,7 +99,7 @@ ARCH          ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[34567
  
  # Get ARCH from the compiler if cross compiling 
  ifneq ($(CROSS_COMPILE),)
@@ -28,5 +28,5 @@ index 47ed361..7420344 100755
  
  # FreeBSD (and possibly others) reports amd64 instead of x86_64
 -- 
-2.36.1
+2.47.1
 
package/gnu-efi/0002-Make-CHAR16-use-uint16_t.patch deleted +0 -164

164 lines not on this page · raw message

package/gnu-efi/0003-Use-char16_t-literals.patch deleted +0 -2103

2,103 lines not on this page · raw message

package/gnu-efi/Config.in +1 -1
index 35446876f6..1177e9d9ba 100644
@@ -15,4 +15,4 @@ config BR2_PACKAGE_GNU_EFI
 	  (IPF), IA-32 (x86), and MIPS platforms using the GNU toolchain
 	  and the EFI development environment.
 
-	  http://gnu-efi.sourceforge.net/
+	  https://github.com/ncroxon/gnu-efi
package/gnu-efi/gnu-efi.hash +1 -4
index e059da867e..49d26f868e 100644
@@ -1,6 +1,3 @@
-# From http://sourceforge.net/projects/gnu-efi/files
-md5  0b93ad70dff96991dd87978fc4275bd1  gnu-efi-3.0.18.tar.bz2
-sha1  4f12dc4ab3e7940070c87affea17bf8a6209957a  gnu-efi-3.0.18.tar.bz2
 # Locally computed
-sha256  7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c  gnu-efi-3.0.18.tar.bz2
+sha256  a2e5dfd25e7fc0cd2027d75dc2517b4c74d94f801ff4784eca557ac1b9835899  gnu-efi-4.0.0.tar.gz
 sha256  42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265  README.efilib
package/gnu-efi/gnu-efi.mk +2 -3
index 2eed4e40d2..4b9a6a7cd5 100644
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-GNU_EFI_VERSION = 3.0.18
-GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
-GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
+GNU_EFI_VERSION = 4.0.0
+GNU_EFI_SITE = $(call github,ncroxon,gnu-efi,$(GNU_EFI_VERSION))
 GNU_EFI_INSTALL_STAGING = YES
 GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib)
 GNU_EFI_LICENSE_FILES = README.efilib
Signature · 6 lines
2.47.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#10 lore raw

Re: [Buildroot] [PATCH 4/4] package/gnu-efi: change upstream, bump to 4.0.0

Hi Thomas,

Thanks for the patches! I applied patches 1 to 3 of this series.

For this patch, "make gnu-efi-legal-info" is failing. See below.

Quoted 13 lines · Thomas Petazzoni

https://sourceforge.net/projects/gnu-efi/ is dead and stuck at version 3.0.18. At https://sourceforge.net/p/gnu-efi/feature-requests/11/ the upstream maintainer has indicated that the project is now maintained at https://github.com/ncroxon/gnu-efi/, so let's use this as upstream.

We can drop patches 0002 and 0003 since they are upstream. Patch 0001 is just slightly refreshed.

Changes 3.0.18 -> 3.0.19:
https://github.com/ncroxon/gnu-efi/releases/tag/3.0.19

Changes 3.0.19 -> 4.0.0:
https://github.com/ncroxon/gnu-efi/releases/tag/4.0.0

[...]

Quoted 10 lines
package/gnu-efi/gnu-efi.hash +0 -4
index e059da867e..49d26f868e 100644
@@ -1,6 +1,3 @@
-# From http://sourceforge.net/projects/gnu-efi/files
-md5  0b93ad70dff96991dd87978fc4275bd1  gnu-efi-3.0.18.tar.bz2
-sha1  4f12dc4ab3e7940070c87affea17bf8a6209957a  gnu-efi-3.0.18.tar.bz2
 # Locally computed
-sha256  
Quoted 5 lines

7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c gnu-efi-3.0.18.tar.bz2 +sha256
a2e5dfd25e7fc0cd2027d75dc2517b4c74d94f801ff4784eca557ac1b9835899 gnu-efi-4.0.0.tar.gz
sha256
42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib

It seems the license file "README.efilib" has beed renamed to "licenses/LICENSE.efilib", see:
https://github.com/ncroxon/gnu-efi/commit/2a3244d2e532ea3c73d8cb2b58d1870c7bcd0c90

Also, new license files "LICENSE" and "licenses/LICENSE.edk2" has been added in:
https://github.com/ncroxon/gnu-efi/commit/2a3244d2e532ea3c73d8cb2b58d1870c7bcd0c90

Quoted 16 lines
package/gnu-efi/gnu-efi.mk +2 -3
index 2eed4e40d2..4b9a6a7cd5 100644
@@ -4,9 +4,8 @@
 #
 
 ################################################################################
 
-GNU_EFI_VERSION = 3.0.18
-GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
-GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
+GNU_EFI_VERSION = 4.0.0
+GNU_EFI_SITE = $(call github,ncroxon,gnu-efi,$(GNU_EFI_VERSION))
 GNU_EFI_INSTALL_STAGING = YES
 GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause 
Quoted 1 line

(efilib)

We should add "BSD-2-Clause-Patent (EDK2 routines)" in _LICENSE.

Quoted 1 line

GNU_EFI_LICENSE_FILES = README.efilib

Here, we should have something like:
GNU_EFI_LICENSE_FILES = LICENSE licenses/LICENSE.edk2 licenses/LICENSE.efilib

Can you send a v2 with those license info updated, please?

Best regards,

Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#11 lore raw

Re: [Buildroot] [PATCH 4/4] package/gnu-efi: change upstream, bump to 4.0.0

Hello Julien,

Quoted 1 line · On Sun, 19 Jan 2025 13:32:02 +0100 Julien Olivain <[email protected]> wrote:

Thanks for the patches! I applied patches 1 to 3 of this series.

Thanks!

Quoted 1 line

For this patch, "make gnu-efi-legal-info" is failing. See below.

[...]

Quoted 1 line

Can you send a v2 with those license info updated, please?

Dammit, I had forgotten about the basics. Thanks for spotting this, I will review the legal-info details, and send a v2.

Best regards,

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot