* Drop backport patches.
* Refresh patches.
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
---
...-parallel-make-failure-for-archives.patch} | 12 ++++---
...0001-riscv64-adjust-type-definitions.patch | 34 -------------------
.../0001-riscv64-ignore-unknown-relocs.patch | 32 -----------------
...002-Do-not-treat-warnings-as-errors.patch} | 21 +++++++++---
.../gnu-efi-3.0.9-fix-clang-build.patch | 24 -------------
.../{gnu-efi_3.0.17.bb => gnu-efi_3.0.18.bb} | 9 ++---
6 files changed, 27 insertions(+), 105 deletions(-)
rename meta/recipes-bsp/gnu-efi/gnu-efi/{parallel-make-archives.patch =>
0001-Fix-parallel-make-failure-for-archives.patch} (85%)
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
rename meta/recipes-bsp/gnu-efi/gnu-efi/{no-werror.patch =>
0002-Do-not-treat-warnings-as-errors.patch} (57%)
delete mode 100644
meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.17.bb => gnu-efi_3.0.18.bb} (88%)
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
similarity index 85%
rename from meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
rename to
meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
index 63d9b6fc31..3c11baca0c 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch
+++
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Fix-parallel-make-failure-for-archives.patch
@@ -1,4 +1,4 @@
-From f56ddb00a656af2e84f839738fad19909ac65047 Mon Sep 17 00:00:00 2001
+From 70e30774debb9ab5d53a29c183f86fc569661b7c Mon Sep 17 00:00:00 2001
From: Saul Wold <s...@linux.intel.com>
Date: Sun, 9 Mar 2014 15:22:15 +0200
Subject: [PATCH] Fix parallel make failure for archives
@@ -19,16 +19,15 @@ Signed-off-by: Darren Hart <dvh...@linux.intel.com>
Signed-off-by: California Sullivan <california.l.sulli...@intel.com>
[Rebased for 3.0.8]
Signed-off-by: Yi Zhao <yi.z...@windriver.com>
-
---
lib/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile b/lib/Makefile
-index 1fc6a47..54b0ca7 100644
+index ec1f9e3..79a794d 100644
--- a/lib/Makefile
+++ b/lib/Makefile
-@@ -77,7 +77,7 @@ libsubdirs:
+@@ -75,7 +75,7 @@ libsubdirs:
$(OBJS): libsubdirs
libefi.a: $(OBJS)
@@ -36,4 +35,7 @@ index 1fc6a47..54b0ca7 100644
+ $(AR) $(ARFLAGS) $@ $(OBJS)
clean:
- rm -f libefi.a *~ $(OBJS) */*.o
+ @rm -vf libefi.a *~ $(OBJS) */*.o
+--
+2.25.1
+
diff --git
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
deleted file mode 100644
index 3475606264..0000000000
---
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-adjust-type-definitions.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 1de509497826faa0ad84b82f5e2c3d21ee613459 Mon Sep 17 00:00:00 2001
-From: Moody Liu <mooodyhun...@outlook.com>
-Date: Sat, 13 May 2023 17:39:16 +0100
-Subject: [PATCH] riscv64: adjust type definitions
-
-CHAR8 needs to be defined while BOOLEAN should be removed
-here to prevent typedef conflicts
-
-Upstream-Status: Backport
[https://sourceforge.net/p/gnu-efi/code/ci/1de509497826faa0ad84b82f5e2c3d21ee613459/]
-Signed-off-by: Moody Liu <mooodyhun...@outlook.com>
----
- inc/riscv64/efibind.h | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/inc/riscv64/efibind.h b/inc/riscv64/efibind.h
-index 4fdf81d..d8b4f39 100644
---- a/inc/riscv64/efibind.h
-+++ b/inc/riscv64/efibind.h
-@@ -32,11 +32,9 @@ typedef uint16_t UINT16;
- typedef int16_t INT16;
- typedef uint8_t UINT8;
- typedef int8_t INT8;
-+typedef char CHAR8;
- typedef wchar_t CHAR16;
- #define WCHAR CHAR16
--#ifndef BOOLEAN
--typedef uint8_t BOOLEAN;
--#endif
- #undef VOID
- typedef void VOID;
- typedef int64_t INTN;
---
-2.41.0
-
diff --git
a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
deleted file mode 100644
index 5b3c152c5e..0000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-riscv64-ignore-unknown-relocs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 708f66acfec9a86f237726d45095cbd380fd83ca Mon Sep 17 00:00:00 2001
-From: Callum Farmer <gm...@opensuse.org>
-Date: Wed, 21 Jun 2023 11:32:28 +0100
-Subject: [PATCH] riscv64: ignore unknown relocs
-
-Sometimes ld emits relocs such as R_RISCV_64 for unwind symbols
-these don't need to be handled yet so just can be skipped otherwise
-the binary will never load
-
-Upstream-Status: Backport
[https://sourceforge.net/p/gnu-efi/code/ci/708f66acfec9a86f237726d45095cbd380fd83ca/]
-Signed-off-by: Callum Farmer <gm...@opensuse.org>
----
- gnuefi/reloc_riscv64.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/gnuefi/reloc_riscv64.c b/gnuefi/reloc_riscv64.c
-index 0b02d83..e429602 100644
---- a/gnuefi/reloc_riscv64.c
-+++ b/gnuefi/reloc_riscv64.c
-@@ -81,8 +81,7 @@ EFI_STATUS EFIAPI _relocate(long ldbase, Elf_Dyn *dyn)
- *addr = ldbase + rel->r_addend;
- break;
- default:
-- /* Panic */
-- while (1) ;
-+ break;
- }
- rel = (Elf_Rela *)((char *)rel + relent);
- relsz -= relent;
---
-2.41.0
-
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch
similarity index 57%
rename from meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch
rename to
meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch
index db2bcf70b7..37befc8b4c 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/no-werror.patch
+++
b/meta/recipes-bsp/gnu-efi/gnu-efi/0002-Do-not-treat-warnings-as-errors.patch
@@ -1,14 +1,24 @@
-Do not treat warnings as errors
+From 89218bb3c5eb7b97987769cb4f7bf8323d35ca7e Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.k...@gmail.com>
+Date: Thu, 16 May 2024 21:38:32 +0800
+Subject: [PATCH] Do not treat warnings as errors
There are additional warnings found with musl which are
treated as errors and fails the build, we have more combinations
then upstream supports to handle
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Khem Raj <raj.k...@gmail.com>
+---
+ Make.defaults | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Make.defaults b/Make.defaults
+index 0068e31..b643285 100755
--- a/Make.defaults
+++ b/Make.defaults
-@@ -187,7 +187,7 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wex
+@@ -190,7 +190,7 @@ CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Werror \
-funsigned-char -fshort-wchar -fno-strict-aliasing \
-ffreestanding -fno-stack-protector
else
@@ -16,4 +26,7 @@ Upstream-Status: Inappropriate [OE specific]
+CFLAGS += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign \
-funsigned-char -fshort-wchar -fno-strict-aliasing \
-ffreestanding -fno-stack-protector -fno-stack-check \
- -fno-stack-check \
+ $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,)
+--
+2.25.1
+
diff --git
a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
b/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
deleted file mode 100644
index c6d660095e..0000000000
--- a/meta/recipes-bsp/gnu-efi/gnu-efi/gnu-efi-3.0.9-fix-clang-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Fix building with CLANG-9.0.0
-
-Fixes
-clang-9: error: unknown argument: '-maccumulate-outgoing-args'
-
-Upstream-Status: Submitted [https://sourceforge.net/p/gnu-efi/patches/70/]
-Signed-off-by: Khem Raj <raj.k...@gmail.com>
-
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -110,10 +110,10 @@
- || ( [ $(GCCVERSION) -eq "4" ] \
- && [ $(GCCMINOR) -ge "7" ] ) ) \
- && echo 1)
-- ifeq ($(GCCNEWENOUGH),1)
-- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-- else ifeq ($(USING_CLANG),clang)
-+ ifeq ($(USING_CLANG),clang)
- CPPFLAGS += -DGNU_EFI_USE_MS_ABI --std=c11
-+ else ifeq ($(GCCNEWENOUGH),1)
-+ CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
- endif
-
- CFLAGS += -mno-red-zone
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb
b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
similarity index 88%
rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb
rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
index 43b7cc7529..a56a85bdef 100644
--- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb
+++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.18.bb
@@ -13,13 +13,10 @@ LIC_FILES_CHKSUM =
"file://gnuefi/crt0-efi-arm.S;beginline=4;endline=16;md5=e582
"
SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \
- file://parallel-make-archives.patch \
- file://gnu-efi-3.0.9-fix-clang-build.patch \
- file://0001-riscv64-adjust-type-definitions.patch \
- file://0001-riscv64-ignore-unknown-relocs.patch \
- file://no-werror.patch \
+ file://0001-Fix-parallel-make-failure-for-archives.patch \
+ file://0002-Do-not-treat-warnings-as-errors.patch \
"
-SRC_URI[sha256sum] =
"7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4"
+SRC_URI[sha256sum] =
"7f212c96ee66547eeefb531267b641e5473d7d8529f0bd8ccdefd33cf7413f5c"
COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux"
COMPATIBLE_HOST:armv4 = 'null'
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199502):
https://lists.openembedded.org/g/openembedded-core/message/199502
Mute This Topic: https://lists.openembedded.org/mt/106146619/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
