package/gnu-efi: change upstream, bump to 4.0.0
PATCH v2 1/1 package/gnu-efi: change upstream, bump to 4.0.0
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
The licensing files have changed:
- A LICENSE file has been added, with the text of the GPLv2
- The README.efilib file has been moved, unchanged to licenses/LICENSE.efilib
- A new file containing the EDK2 license has been added at licenses/LICENSE.edk2. This requires an update in the list of licenses
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
---
This v2 updates the licensing information, based on the feedback from Julien Olivain.
However, I must say that the licensing is really unclear. The main LICENSE file contains the text of the GPLv2. Our LICENSE variable says it's mostly BSD-3-Clause or GPLv2+, but only a few source files seem to have this double license, and it seems to actually be BSD-2-Clause or GPLv2+. But the fact that there's a top-level GPLv2 license text is very confusing.
--- ...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 | 9 +- package/gnu-efi/gnu-efi.mk | 9 +- 6 files changed, 13 insertions(+), 2282 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
@@ -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
@@ -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 +4 -5
@@ -1,6 +1,5 @@ -# 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 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib +sha256 a2e5dfd25e7fc0cd2027d75dc2517b4c74d94f801ff4784eca557ac1b9835899 gnu-efi-4.0.0.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE +sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 licenses/LICENSE.efilib +sha256 7aa278b6f1a2125d0a0c596fa537caca5a41e7b03f7d2dd0489905f65ffdb984 licenses/LICENSE.edk2
package/gnu-efi/gnu-efi.mk +4 -5
@@ -4,12 +4,11 @@ # ################################################################################ -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 +GNU_EFI_LICENSE = BSD-3-Clause and/or GPL-2.0+ (gnuefi), BSD-3-Clause (efilib), BSD-2-Clause-Patent (EDK2 routines) +GNU_EFI_LICENSE_FILES = LICENSE licenses/LICENSE.edk2 licenses/LICENSE.efilib # gnu-efi is a set of library and header files used to build # standalone EFI applications such as bootloaders. There is no point
Signature · 6 lines
2.47.1 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 67 lines · 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.19Changes 3.0.19 -> 4.0.0:
https://github.com/ncroxon/gnu-efi/releases/tag/4.0.0The licensing files have changed:
- A LICENSE file has been added, with the text of the GPLv2
- The README.efilib file has been moved, unchanged to licenses/LICENSE.efilib
- A new file containing the EDK2 license has been added at licenses/LICENSE.edk2. This requires an update in the list of licenses
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_BUSYBOXis not set BR2_PACKAGE_FWUPD_EFI=y
#BR2_TARGET_ROOTFS_TARis not setRISC-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_BUSYBOXis not set BR2_PACKAGE_FWUPD_EFI=y
#BR2_TARGET_ROOTFS_TARis not setx86-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_BUSYBOXis not set BR2_PACKAGE_SYSTEMD_BOOT=y
#BR2_TARGET_ROOTFS_TARis not set
BR2_TARGET_SYSLINUX=y
BR2_TARGET_SYSLINUX_EFI=y
Quoted 1 line
Signed-off-by Thomas Petazzoni <[email protected]>
Applied to master, thanks.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot