From 1cbfa99360b4b46c0c4dab7eb7909876080dd07e Mon Sep 17 00:00:00 2001 From: jchzhou Date: Fri, 24 Jan 2025 11:10:23 +0800 Subject: [PATCH] riscv64: drop an obsolete upstreamed patch Signed-off-by: jchzhou (cherry picked from commit 8d40b21bbf69be90321e75b9af6c20baf9456f2e) --- gnu-efi.spec | 9 +++--- ...ix-efibind.h-missing-duplicate-types.patch | 31 ------------------- 2 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 riscv64-fix-efibind.h-missing-duplicate-types.patch diff --git a/gnu-efi.spec b/gnu-efi.spec index e26b1b8..aae7b03 100644 --- a/gnu-efi.spec +++ b/gnu-efi.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: gnu-efi Version: 3.0.18 -Release: 1 +Release: 2 Summary: Development Libraries and headers for EFI Epoch: 1 License: BSD @@ -12,10 +12,6 @@ Source0: https://sourceforge.net/projects/gnu-efi/files/%{name}-%{version} Source1: stubs-32.h Patch1: 0001-gnu-efi-add-CHAR16-for-loongarch64.patch -%ifarch riscv64 -Patch2: riscv64-fix-efibind.h-missing-duplicate-types.patch -%endif - %global efidir %(eval echo $(grep ^ID= /etc/os-release | sed 's/^ID=//')) %ifarch x86_64 @@ -78,6 +74,9 @@ mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidi %{_includedir}/efi %changelog +* Fri Jan 24 2025 jchzhou - 1:3.0.18-2 +- Drop an obsolete patch (upstreamed in 3.0.18) for riscv64 + * Wed Dec 04 2024 zhang_wenyu1 - 1:3.0.18-1 - Upgrade to version 3.0.18 diff --git a/riscv64-fix-efibind.h-missing-duplicate-types.patch b/riscv64-fix-efibind.h-missing-duplicate-types.patch deleted file mode 100644 index 42d7979..0000000 --- a/riscv64-fix-efibind.h-missing-duplicate-types.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5d4343079fd8c23f2e1773bec6c1630918eda441 Mon Sep 17 00:00:00 2001 -From: Pete Batard -Date: Thu, 18 May 2023 13:30:07 +0100 -Subject: [PATCH] riscv64: fix efibind.h missing/duplicate types - -The RISC-V 64 definition for CHAR8 is missing, so add it. -Likewise, BOOLEAN is defined in inc/efidef.h, so remove it. ---- - 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.39.1.windows.1 - -- Gitee