2 files changed, 3 insertions, 45 deletions

diff --git a/recipes-containers/cri-o/cri-o_git.bb b/recipes-containers/cri-o/cri-o_git.bb
index 2d971bd7..11374297 100644
--- a/recipes-containers/cri-o/cri-o_git.bb
+++ b/recipes-containers/cri-o/cri-o_git.bb
@@ -14,10 +14,9 @@ At a high level, we expect the scope of cri-o to be restricted to the following
  - Resource isolation as required by the CRI \
  "
 
-SRCREV_cri-o = "318db72eb0b3d18c22c995aa7614a13142287296"
+SRCREV_cri-o = "87ce1c120d022797913f0792e15dd0107d19dffe"
 SRC_URI = "\
-        git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.32;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
-        file://0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch;patchdir=src/import \
+        git://github.com/kubernetes-sigs/cri-o.git;branch=release-1.34;name=cri-o;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
         file://crio.conf \
         file://run-ptest \
         "
@@ -28,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
 
 GO_IMPORT = "import"
 
-PV = "1.32.2+git${SRCREV_cri-o}"
+PV = "1.33.0+git${SRCREV_cri-o}"
 
 inherit features_check ptest
 REQUIRED_DISTRO_FEATURES ?= "seccomp"
diff --git a/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch b/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch
deleted file mode 100644
index 33c65b5a..00000000
--- a/recipes-containers/cri-o/files/0001-Makefile-introduce-GO_TEST-for-more-flexible-configu.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 656cb24b07b1e5b63939c15dc31d8c9839ecce75 Mon Sep 17 00:00:00 2001
-From: Chen Qi <Qi.Chen@windriver.com>
-Date: Tue, 14 Jan 2025 20:55:50 -0800
-Subject: [PATCH] Makefile: introduce GO_TEST for more flexible configuration
-
-Introduce GO_TEST and make it similar to GO_BUILD.
-
-Note that with this change, the default behavior changes a little bit,
-that is, TRIMPATH, GCFLAGS and GO_LDFALGS all have effect on test/nri/nri.test.
-
-Upstream-Status: Submitted [https://github.com/cri-o/cri-o/pull/8912]
-
-Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
----
- Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 34f9d429d..f02213894 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,6 +3,7 @@ GO ?= go
- TRIMPATH ?= -trimpath
- GO_ARCH=$(shell $(GO) env GOARCH)
- GO_BUILD ?= $(GO) build $(TRIMPATH)
-+GO_TEST ?= $(GO) test $(TRIMPATH)
- GO_RUN ?= $(GO) run
- NIX_IMAGE ?= nixos/nix:2.24.3
- 
-@@ -213,7 +214,7 @@ test/checkcriu/checkcriu: $(GO_FILES) ## Build the checkcriu test binary.
-        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./test/checkcriu
- 
- test/nri/nri.test: $(wildcard test/nri/*.go) ## Build the NRI test binary.
--       $(GO) test --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
-+       $(GO_TEST) $(GCFLAGS) $(GO_LDFLAGS) --tags "test $(BUILDTAGS)" -c ./test/nri -o $@
- 
- bin/crio: $(GO_FILES) ## Build the CRI-O main binary.
-        $(GO_BUILD) $(GCFLAGS) $(GO_LDFLAGS) -tags "$(BUILDTAGS)" -o $@ ./cmd/crio
--- 
-2.25.1
-