3 files changed, 0 insertions, 95 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
deleted file mode 100644
index 63498a86..00000000
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 474b93f8f643651144304a6971ef476add7f06f8 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Tue, 25 May 2021 12:49:41 -0400
-Subject: [PATCH] Makefile: allow GO_BUILD_FLAGS to be externally specified
-
-Since our oe-core go infrastructure insists on both -pie and static
-builds (for the most part), and that is not recommended by many
-packages, we end up with errors like:
-
-  cannot find package runtime/cgo (using -importcfg)
-          ...
-         recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link:
-         cannot open file : open : no such file or directory
-
-Upstream-Status: Inappropriate [specific to OE go configuration and build]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-Index: containerd/Makefile
-===================================================================
---- containerd.orig/Makefile
-+++ containerd/Makefile
-@@ -129,7 +129,8 @@
- GOPATHS=$(shell $(GO) env GOPATH | tr ":" "\n" | tr ";" "\n")
- 
- TESTFLAGS_RACE=
--GO_BUILD_FLAGS ?=
-+# allow flags to be exported and picked up.
-+# GO_BUILD_FLAGS ?=
- # See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809
- GO_GCFLAGS=$(shell                             \
-        set -- ${GOPATHS};                      \
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch b/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
deleted file mode 100644
index 74e313b5..00000000
--- a/recipes-containers/containerd/containerd-opencontainers/0001-Makefile-update-default-PACKAGE-to-v2.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From eb39888898a9d196e3eb63724c6c07777f3b9402 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 24 Apr 2024 14:10:11 +0800
-Subject: [PATCH] Makefile: update default PACKAGE to v2
-
-Upstream-Status: Submitted [https://github.com/containerd/containerd/pull/10125]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index a5b244191..cb9ff4172 100644
---- a/Makefile
-+++ b/Makefile
-@@ -34,7 +34,7 @@ TEST_IMAGE_LIST ?=
- # Used to populate variables in version package.
- VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always)
- REVISION ?= $(shell git rev-parse HEAD)$(shell if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi)
--PACKAGE=github.com/containerd/containerd
-+PACKAGE=github.com/containerd/containerd/v2
- SHIM_CGO_ENABLED ?= 0
- 
- ifneq "$(strip $(shell command -v $(GO) 2>/dev/null))" ""
--- 
-2.25.1
-
diff --git a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch b/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
deleted file mode 100644
index 62580c6c..00000000
--- a/recipes-containers/containerd/containerd-opencontainers/0001-build-don-t-use-gcflags-to-define-trimpath.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9174091fa1624dbb09ce812792a4102dff693541 Mon Sep 17 00:00:00 2001
-From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Mon, 12 Sep 2022 15:40:08 -0400
-Subject: [PATCH] build: don't use gcflags to define trimpath
-
-We can pass trimpath in via environment variables. The gcflags
-definition of trimpath is for older go versions and is using the
-complete path for trimming. If the variable is captured in the
-resulting binary, we have a reproducibility and QA issue.
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git git.orig/Makefile git.orig/Makefile
-index 4a6c13042..debb57925 100644
---- git.orig/Makefile
-+++ git.orig/Makefile
-@@ -130,7 +130,6 @@ TESTFLAGS_RACE=
- # See Golang issue re: '-trimpath': https://github.com/golang/go/issues/13809
- GO_GCFLAGS=$(shell                             \
-        set -- ${GOPATHS};                      \
--       echo "-gcflags=-trimpath=$${1}/src";    \
-        )
- 
- BINARIES=$(addprefix bin/,$(COMMANDS))
--- 
-2.19.1
-