summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-containers/containerd/containerd-opencontainers_git.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb
index 361ed259..edb59747 100644
--- a/recipes-containers/containerd/containerd-opencontainers_git.bb
+++ b/recipes-containers/containerd/containerd-opencontainers_git.bb
@@ -5,8 +5,8 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and
5 support as well as checkpoint and restore for cloning and live migration of containers." 5 support as well as checkpoint and restore for cloning and live migration of containers."
6 6
7 7
8SRCREV = "1e5ef943eb76627a6d3b6de8cd1ef6537f393a71" 8SRCREV = "d12516713c315ea9e651eb1df89cf32ff7c8137c"
9SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5;protocol=https \ 9SRC_URI = "git://github.com/containerd/containerd;branch=release/1.6;protocol=https \
10 file://0001-Add-build-option-GODEBUG-1.patch \ 10 file://0001-Add-build-option-GODEBUG-1.patch \
11 file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \ 11 file://0001-Makefile-allow-GO_BUILD_FLAGS-to-be-externally-speci.patch \
12 " 12 "
@@ -15,7 +15,7 @@ SRC_URI = "git://github.com/containerd/containerd;branch=release/1.5;protocol=ht
15LICENSE = "Apache-2.0" 15LICENSE = "Apache-2.0"
16LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89" 16LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=1269f40c0d099c21a871163984590d89"
17 17
18CONTAINERD_VERSION = "v1.5.8" 18CONTAINERD_VERSION = "v1.6.1"
19 19
20EXTRA_OEMAKE += "GODEBUG=1" 20EXTRA_OEMAKE += "GODEBUG=1"
21 21
@@ -54,7 +54,8 @@ do_compile() {
54 protobuf reference diff platforms runtime remotes version archive dialer gc metadata \ 54 protobuf reference diff platforms runtime remotes version archive dialer gc metadata \
55 metrics filters identifiers labels leases plugin server services \ 55 metrics filters identifiers labels leases plugin server services \
56 cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \ 56 cmd cio containers namespaces oci events log reaper sys rootfs nvidia seed apparmor seccomp \
57 cap cri userns atomic ioutil os registrar seutil runtimeoptions netns; do 57 cap cri userns atomic ioutil os registrar seutil runtimeoptions netns \
58 shutdown schedcore tracing; do
58 if [ -d ${S}/src/import/${c} ]; then 59 if [ -d ${S}/src/import/${c} ]; then
59 ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c} 60 ln -sfn ${S}/src/import/${c} ${S}/src/import/vendor/github.com/containerd/containerd/${c}
60 fi 61 fi