package/gnu-efi: bump to version 3.0.14
Patch 0001-Make.defaults-don-t-override-ARCH-when-cross-compili.patch
is refreshed to accommodate with conflicting upstream changes.
Patch 0002-Revert-efilink-fix-build-with-gcc-4.8.patch is dropped as
it is upstream as of commit
8b2da2c2247af28bd681a9c8e3231559964c80a6 ("Revert "efilink: fix build
with gcc 4.8"").
A new patch is needed to fix the build on mips64.
While at it, fix the hash file to use the new spacing convention.
Fixes:
http://autobuild.buildroot.net/results/a9a7372615e3fbe4b8abda946706d1ccadf28931/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Thomas Petazzoni
Arnout Vandecappelle (Essensium/Mind)
parent
d7ec0f7e97
commit
67a1e8a552
@ -1,4 +1,4 @@
|
||||
From 3452721eafae90749f4af63264c412f398460b15 Mon Sep 17 00:00:00 2001
|
||||
From b2dbeec5063265eb0121342c24a900a4888712a7 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
|
||||
@ -15,18 +15,18 @@ Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Make.defaults b/Make.defaults
|
||||
index ba743f1..a0e5632 100755
|
||||
index 47ed361..7420344 100755
|
||||
--- a/Make.defaults
|
||||
+++ b/Make.defaults
|
||||
@@ -67,7 +67,7 @@ ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[345678
|
||||
|
||||
# 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,armv7.*,arm,' )
|
||||
+ ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' )
|
||||
- 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.14.1
|
||||
2.36.1
|
||||
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 1f7b2e5bd6603b30202a66b6317a41e2be85742b Mon Sep 17 00:00:00 2001
|
||||
From: Esben Haabendal <esben@haabendal.dk>
|
||||
Date: Tue, 26 Mar 2019 13:37:02 +0100
|
||||
Subject: [PATCH] Revert "efilink: fix build with gcc 4.8"
|
||||
|
||||
This reverts commit 6335e5c697c57d8b5854b8202de3733bcb151ca6, as it breaks
|
||||
gcc builds with '-nostdinc' flag.
|
||||
|
||||
The fix in 1a53d8f88a452847b25f9689f9a08dbcf82c86e4
|
||||
(Fix for problem with undeclared intptr_t type), which is also merged
|
||||
fixes the same problem, without causing breakage.
|
||||
|
||||
Signed-off-by: Esben Haabendal <esben@haabendal.dk>
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
[Upstream status:
|
||||
https://sourceforge.net/p/gnu-efi/code/merge-requests/6/]
|
||||
---
|
||||
inc/efilink.h | 4 ----
|
||||
1 file changed, 4 deletions(-)
|
||||
|
||||
diff --git a/inc/efilink.h b/inc/efilink.h
|
||||
index b69a6fd..cc5aa2d 100644
|
||||
--- a/inc/efilink.h
|
||||
+++ b/inc/efilink.h
|
||||
@@ -1,10 +1,6 @@
|
||||
#ifndef _EFI_LINK_H
|
||||
#define _EFI_LINK_H
|
||||
|
||||
-#if defined(__GNUC__)
|
||||
-#include <stdint.h>
|
||||
-#endif
|
||||
-
|
||||
/*++
|
||||
|
||||
Copyright (c) 1998 Intel Corporation
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
From 2c0ad0d7547558be59ef10dd289e619373341704 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Thu, 21 Jul 2022 09:47:49 +0200
|
||||
Subject: [PATCH] inc/efi*.h: also support __mips64 to recognize mips64
|
||||
|
||||
gcc built-in define for the MIPS64 architecture is __mips64, not
|
||||
__mips64__, so the current condition did not match for gcc. See
|
||||
https://gcc.gnu.org/git/?p=gcc.git;a=blob;f=gcc/config/mips/mips.h;h=47aac9d3d61245c4d3df5dbd0bbcd833190de7c3;hb=2d280e7eafc086e9df85f50ed1a6526d6a3a204d#l431
|
||||
in the gcc source.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Upstream: https://sourceforge.net/p/gnu-efi/mailman/message/37683797/
|
||||
---
|
||||
inc/efi.h | 2 +-
|
||||
inc/efilib.h | 2 +-
|
||||
inc/efirtlib.h | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/inc/efi.h b/inc/efi.h
|
||||
index 43c832e..b193932 100644
|
||||
--- a/inc/efi.h
|
||||
+++ b/inc/efi.h
|
||||
@@ -48,7 +48,7 @@ Revision History
|
||||
#include "aarch64/efibind.h"
|
||||
#elif defined (_M_ARM) || defined(__arm__)
|
||||
#include "arm/efibind.h"
|
||||
-#elif defined (_M_MIPS64) || defined(__mips64__)
|
||||
+#elif defined (_M_MIPS64) || defined(__mips64__) || defined(__mips64)
|
||||
#include "mips64el/efibind.h"
|
||||
#elif defined (__riscv) && __riscv_xlen == 64
|
||||
#include "riscv64/efibind.h"
|
||||
diff --git a/inc/efilib.h b/inc/efilib.h
|
||||
index 9f748ad..a2b39b2 100644
|
||||
--- a/inc/efilib.h
|
||||
+++ b/inc/efilib.h
|
||||
@@ -31,7 +31,7 @@ Revision History
|
||||
#include "aarch64/efilibplat.h"
|
||||
#elif defined (_M_ARM) || defined(__arm__)
|
||||
#include "arm/efilibplat.h"
|
||||
-#elif defined (_M_MIPS64) || defined(__mips64__)
|
||||
+#elif defined (_M_MIPS64) || defined(__mips64__) || defined(__mips64)
|
||||
#include "mips64el/efilibplat.h"
|
||||
#elif defined (__riscv) && __riscv_xlen == 64
|
||||
#include "riscv64/efilibplat.h"
|
||||
diff --git a/inc/efirtlib.h b/inc/efirtlib.h
|
||||
index 8643061..518859e 100644
|
||||
--- a/inc/efirtlib.h
|
||||
+++ b/inc/efirtlib.h
|
||||
@@ -30,7 +30,7 @@ Revision History
|
||||
#include "aarch64/efilibplat.h"
|
||||
#elif defined (_M_ARM) || defined(__arm__)
|
||||
#include "arm/efilibplat.h"
|
||||
-#elif defined (_M_MIPS64) || defined(__mips64__)
|
||||
+#elif defined (_M_MIPS64) || defined(__mips64__) || defined(__mips64)
|
||||
#include "mips64el/efilibplat.h"
|
||||
#elif defined (__riscv) && __riscv_xlen == 64
|
||||
#include "riscv64/efilibplat.h"
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# From http://sourceforge.net/projects/gnu-efi/files
|
||||
md5 960a8379b6f95ee73d7778b70bf2a089 gnu-efi-3.0.10.tar.bz2
|
||||
sha1 a51b81eda97c0acbf3ac86123f298d3c0e396ce5 gnu-efi-3.0.10.tar.bz2
|
||||
md5 e2902ad09d53d7a94dc96a449dbb4058 gnu-efi-3.0.14.tar.bz2
|
||||
sha1 e46b3726478838e85d0a79d0a0d3508c4f2995cf gnu-efi-3.0.14.tar.bz2
|
||||
# Locally computed
|
||||
sha256 f12082a3a5f0c3e38c67262a9f34245d139ac2cdfc0a0bdcf03c9b1f56fa4fed gnu-efi-3.0.10.tar.bz2
|
||||
sha256 b73b643a0d5697d1f396d7431448e886dd805668789578e3e1a28277c9528435 gnu-efi-3.0.14.tar.bz2
|
||||
sha256 42d352e9c28dd446fd0209cd6f75588c8e41f0934540bb382bbd61c752360265 README.efilib
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNU_EFI_VERSION = 3.0.10
|
||||
GNU_EFI_VERSION = 3.0.14
|
||||
GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2
|
||||
GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi
|
||||
GNU_EFI_INSTALL_STAGING = YES
|
||||
|
||||
Loading…
Reference in New Issue
Block a user