2 files changed, 12 insertions, 15 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 5772c1ae..afd7c4bf 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
@@ -33,20 +33,17 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  src/import/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile b/Makefile
-index acf0fc0..130988c 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -63,7 +63,8 @@ critest:
-             $(PROJECT)/cmd/critest
+Index: cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile
+===================================================================
+--- cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54.orig/src/import/Makefile
++++ cri-tools-1.21.0+gitfa50f4af0f6beba20264bfb3fd4d1d34e42f7b54/src/import/Makefile
+@@ -73,7 +73,8 @@
+        @$(MAKE) -B $(CRICTL)
  
- crictl:
--       CGO_ENABLED=0 $(GO_BUILD) -o $(CURDIR)/_output/crictl$(BIN_EXT) \
-+       $(GO_BUILD) -o $(CURDIR)/_output/crictl$(BIN_EXT) \
+ $(CRICTL):
+-       CGO_ENABLED=0 $(GO_BUILD) -o $@ \
++       $(GO_BUILD) -o $@ \
 +               -a -pkgdir dontusecurrentpkgs \
                 -ldflags '$(GO_LDFLAGS)' \
                 -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 17ddbd02..ad054e1c 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 = "ec9e336fd8c21c4bab89a6aed2c4a138c8cfae75"
+SRCREV_cri-tools = "fa50f4af0f6beba20264bfb3fd4d1d34e42f7b54"
 SRC_URI = "\
         git://github.com/kubernetes-sigs/cri-tools.git;branch=master;name=cri-tools \
         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.20.0+git${SRCREV_cri-tools}"
+PV = "1.21.0+git${SRCREV_cri-tools}"
 
 RPROVIDES_${PN} += "crictl"
 PACKAGES =+ "${PN}-critest"
@@ -63,7 +63,7 @@ do_compile() {
 
 do_install() {
     install -d ${D}${bindir}
-    install -m 755 -D ${S}/src/import/_output/* ${D}/${bindir}
+    install -m 755 -D ${S}/src/import/build/bin/* ${D}/${bindir}
 }
 
 FILES_${PN}-critest = "${bindir}/critest"