mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
fb36a4635e
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 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Julien Olivain <ju.o@free.fr>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 893a75202407e8ff3d75b217813a5df87da7c807 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sun, 20 Jan 2019 21:07:11 +0100
|
|
Subject: [PATCH] Make.defaults: don't override ARCH when cross-compiling
|
|
|
|
Don't override the user-provided ARCH when cross-compiling otherwise
|
|
ARCH won't be correct for armv5, aarch64 and x86_64
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/2dfc0e10da25a8382a43557420d7dc3444c02dbb
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
Make.defaults | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/Make.defaults b/Make.defaults
|
|
index 1347aca..bb21874 100755
|
|
--- a/Make.defaults
|
|
+++ b/Make.defaults
|
|
@@ -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),)
|
|
- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )
|
|
+ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' )
|
|
endif
|
|
|
|
# FreeBSD (and possibly others) reports amd64 instead of x86_64
|
|
--
|
|
2.47.1
|
|
|