From 033f4c11a745f53210d5b7f827af1c156111b2b7 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 11 Oct 2024 12:24:21 +0200 Subject: [PATCH] overlay coreos/user-patches: Drop patch for sys-libs/efivar The updated package already has the patch. --- ...uild-util.c-separately-for-makeguids.patch | 37 ------------------- .../user-patches/sys-libs/efivar/README.md | 4 -- 2 files changed, 41 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/README.md diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch deleted file mode 100644 index 99d98a4195..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/0001-src-Makefile-build-util.c-separately-for-makeguids.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ca48d3964d26f5e3b38d73655f19b1836b16bd2d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 18 Jan 2022 11:53:41 +0100 -Subject: [PATCH] src/Makefile: build util.c separately for makeguids - -util.c needs to be built twice when cross-compiling: -for the build machine to be able to link with -makeguids which then runs during the same build, -and then for the actual target. - -Signed-off-by: Alexander Kanavin ---- - src/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 0e423c4..a86abdc 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -27,10 +27,13 @@ EFIVAR_OBJECTS = $(patsubst %.S,%.o,$(pa - EFISECDB_SOURCES = efisecdb.c guid-symbols.c secdb-dump.c util.c - EFISECDB_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(EFISECDB_SOURCES))) - GENERATED_SOURCES = include/efivar/efivar-guids.h guid-symbols.c --MAKEGUIDS_SOURCES = makeguids.c util.c -+MAKEGUIDS_SOURCES = makeguids.c util-makeguids.c - MAKEGUIDS_OBJECTS = $(patsubst %.S,%.o,$(patsubst %.c,%.o,$(MAKEGUIDS_SOURCES))) - MAKEGUIDS_OUTPUT = $(GENERATED_SOURCES) - -+util-makeguids.c : util.c -+ cp util.c util-makeguids.c -+ - ALL_SOURCES=$(LIBEFISEC_SOURCES) $(LIBEFIBOOT_SOURCES) $(LIBEFIVAR_SOURCES) \ - $(MAKEGUIDS_SOURCES) $(GENERATED_SOURCES) $(EFIVAR_SOURCES) \ - $(sort $(wildcard include/efivar/*.h)) --- -2.34.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/README.md b/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/README.md deleted file mode 100644 index 1099415872..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/user-patches/sys-libs/efivar/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The `0001-src-Makefile-build-util.c-separately-for-makeguids.patch` -patch fixes a cross-compilation issue. We will ask Gentoo to include -this patch too in their ebuild. Currently there is no release of -efivar that has this patch.