2 files changed, 16 insertions, 13 deletions

diff --git a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
index 189d905a..2cad7645 100644
--- a/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
+++ b/recipes-containers/cri-tools/cri-tools/0001-build-allow-environmental-CGO-settings-and-pass-dont.patch
@@ -1,6 +1,6 @@
-From 28ee02687339b657a7aa93570015a6751c824e2d Mon Sep 17 00:00:00 2001
+From 567b618f2ab9bb722826688d84f328773e4f37ce Mon Sep 17 00:00:00 2001
 From: Bruce Ashfield <bruce.ashfield@gmail.com>
-Date: Wed, 10 Feb 2021 09:58:24 -0500
+Date: Wed, 17 Aug 2022 11:03:09 -0400
 Subject: [PATCH] build: allow environmental CGO settings and pass
  dontusecurrentpkgs
 
@@ -13,9 +13,9 @@ builds (for the most part), and that is not recommended by many
 packages, we end up with errors like:
 
    1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75/src/import/_output/crictl \
-        -ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0' \
-        -tags '' \
-        github.com/kubernetes-sigs/cri-tools/cmd/crictl
+        -ldflags '-X github.com/kubernetes-sigs/cri-tools/pkg/version.Version=1.20.0' \
+        -tags '' \
+        github.com/kubernetes-sigs/cri-tools/cmd/crictl
     # github.com/kubernetes-sigs/cri-tools/cmd/crictl
     cannot find package runtime/cgo (using -importcfg)
     /work/cortexa72-poky-linux/cri-tools/1.20.0+gitec9e336fd8c21c4bab89a6aed2c4a138c8cfae75-r0/recipe-sysroot-native/usr/lib/aarch64-poky-linux/go/pkg/tool/linux_amd64/link:
@@ -33,11 +33,11 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  src/import/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile
-===================================================================
---- cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa.orig/src/import/Makefile
-+++ cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/Makefile
-@@ -74,7 +74,8 @@
+diff --git a/src/import/Makefile b/src/import/Makefile
+index 7c5b30ec..9b0dfeaf 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -72,7 +72,8 @@ crictl:
         @$(MAKE) -B $(CRICTL)
  
  $(CRICTL):
@@ -46,4 +46,7 @@ Index: cri-tools-1.21.0+gitde32df077e6b0e9e31ce367dfc34c1b6b46e30fa/src/import/M
 +               -a -pkgdir dontusecurrentpkgs \
                 -ldflags '$(GO_LDFLAGS)' \
                 -trimpath \
-                -tags '$(BUILDTAGS)' \
+                $(PROJECT)/cmd/crictl
+-- 
+2.19.1
+
diff --git a/recipes-containers/cri-tools/cri-tools_git.bb b/recipes-containers/cri-tools/cri-tools_git.bb
index b789179b..51ecc205 100644
--- a/recipes-containers/cri-tools/cri-tools_git.bb
+++ b/recipes-containers/cri-tools/cri-tools_git.bb
@@ -16,7 +16,7 @@ What is not in scope for this project? \
     non-exist on the kube-apiserver. \
  "
 
-SRCREV_cri-tools = "23f44eaa489ecd8931ee64de08baa7be9dbdb394"
+SRCREV_cri-tools = "77d02a0356e9e1dca58d44e54dd0799e89856387"
 SRC_URI = "\
         git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools;protocol=https \
         file://0001-build-allow-environmental-CGO-settings-and-pass-dont.patch \
@@ -27,7 +27,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c2
 
 GO_IMPORT = "import"
 
-PV = "1.23.0+git${SRCREV_cri-tools}"
+PV = "1.24.2+git${SRCREV_cri-tools}"
 
 RPROVIDES:${PN} += "crictl"
 PACKAGES =+ "${PN}-critest"