diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-02 00:43:50 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-04-02 00:46:44 -0400 |
commit | 935e3d969ef1c0ce2f2a2719c31285be6114c8f9 (patch) | |
tree | c612b1127551795b4ccc7bb9ee5dd7c20af0b52b /recipes-containers/containerd/containerd-opencontainers_git.bb | |
parent | f5fbfa8ac4db1bab693e8f162dcab992787f244d (diff) | |
download | meta-virtualization-935e3d969ef1c0ce2f2a2719c31285be6114c8f9.tar.gz |
containerd: uprev to v1.0.2
Uprev containerd to v1.0.2 for compatibility with recent docker (18.04+)
builds.
With this uprev we also significantly restructure the build to use more
of the latest oe-core go build infrastructure, but non-standard parts of
the build remain.
We also allow containerd to be build with CGO enabled to avoid linkage
errors with the oe provided go build infrastructure.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/containerd/containerd-opencontainers_git.bb')
-rw-r--r-- | recipes-containers/containerd/containerd-opencontainers_git.bb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb index 37f85472..316eea74 100644 --- a/recipes-containers/containerd/containerd-opencontainers_git.bb +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb | |||
@@ -1,9 +1,11 @@ | |||
1 | SRCREV = "cfd04396dc68220d1cecbe686a6cc3aa5ce3667c" | ||
2 | SRC_URI = "git://github.com/containerd/containerd;nobranch=1 \ | ||
3 | file://0001-containerd-shim-build-with-CGO.patch \ | ||
4 | " | ||
5 | |||
1 | include containerd.inc | 6 | include containerd.inc |
2 | 7 | ||
3 | SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" | 8 | CONTAINERD_VERSION = "v1.0.2" |
4 | SRC_URI = "git://github.com/docker/containerd.git;nobranch=1 \ | ||
5 | " | ||
6 | CONTAINERD_VERSION = "0.2.2" | ||
7 | 9 | ||
8 | PROVIDES += "virtual/containerd" | 10 | PROVIDES += "virtual/containerd" |
9 | RPROVIDES_${PN} = "virtual/containerd" | 11 | RPROVIDES_${PN} = "virtual/containerd" |