2 files changed, 10 insertions, 13 deletions

diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 7755f7db..2c691b59 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -1,5 +1,5 @@
-SRCREV = "0190e5f3900227fc739afbc8f4a03df968dc337b"
-SRC_URI = "git://github.com/containerd/containerd;nobranch=1 \
+SRCREV = "e6b3f5632f50dbc4e9cb6288d911bf4f5e95b18e"
+SRC_URI = "git://github.com/containerd/containerd;branch=release/1.2 \
            file://0001-build-use-oe-provided-GO-and-flags.patch \
           "
 
@@ -7,7 +7,7 @@ include containerd.inc
 
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"
 
-CONTAINERD_VERSION = "v1.2.0"
+CONTAINERD_VERSION = "v1.2.4"
 
 PROVIDES += "virtual/containerd"
 RPROVIDES_${PN} = "virtual/containerd"
diff --git a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
index c2433f14..d4d5973e 100644
--- a/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
+++ b/recipes-containers/containerd/files/0001-build-use-oe-provided-GO-and-flags.patch
@@ -12,16 +12,16 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  Makefile | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/src/import/Makefile b/src/import/Makefile
-index 8e680133..fd7d2813 100644
---- a/src/import/Makefile
-+++ b/src/import/Makefile
-@@ -179,19 +179,19 @@ FORCE:
+Index: git/src/import/Makefile
+===================================================================
+--- git.orig/src/import/Makefile
++++ git/src/import/Makefile
+@@ -166,19 +166,19 @@
  # Build a binary from a cmd.
  bin/%: cmd/% FORCE
         @echo "$(WHALE) $@${BINARY_SUFFIX}"
--       @go build ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
-+       @$(GO) build ${GO_BUILD_FLAGS} ${DEBUG_GO_GCFLAGS} ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
+-       @go build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
++       @$(GO) build ${GO_GCFLAGS} ${GO_BUILD_FLAGS} -o $@${BINARY_SUFFIX} ${GO_LDFLAGS} ${GO_TAGS}  ./$<
  
  bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220
         @echo "$(WHALE) bin/containerd-shim"
@@ -40,6 +40,3 @@ index 8e680133..fd7d2813 100644
  
  binaries: $(BINARIES) ## build binaries
         @echo "$(WHALE) $@"
--- 
-2.19.1
-