diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-20 02:00:20 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-02-20 02:06:22 -0500 |
commit | 7d6284a079748f919e3e0b8116649cfa5ff8ee8f (patch) | |
tree | 7a6f3a22b38f6ecac9631410e19a21904bed6efd /recipes-containers | |
parent | 776422fa046e0779b48ddfaaed4fb35651256258 (diff) | |
download | meta-virtualization-7d6284a079748f919e3e0b8116649cfa5ff8ee8f.tar.gz |
runc/containerd: create virtual/runc and virtual/containerd
Since there are two implementations of runc and containerd that may
not always be in sync, the docker variant, and the opencontainers
variable, we create a virtual/* namespace for these components.
Anything requiring runc or containerd should set a preferred provider
to get the desired/tested variant.
We set the default provider to the docker variants, since they are
the primary use case for these components.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r-- | recipes-containers/containerd/containerd-docker_git.bb | 10 | ||||
-rw-r--r-- | recipes-containers/containerd/containerd-opencontainers_git.bb | 9 | ||||
-rw-r--r-- | recipes-containers/containerd/containerd.inc (renamed from recipes-containers/containerd/containerd_git.bb) | 6 | ||||
-rw-r--r-- | recipes-containers/docker/docker_git.bb | 3 | ||||
-rw-r--r-- | recipes-containers/runc/runc-docker_git.bb | 11 | ||||
-rw-r--r-- | recipes-containers/runc/runc-opencontainers_git.bb | 8 | ||||
-rw-r--r-- | recipes-containers/runc/runc.inc (renamed from recipes-containers/runc/runc_git.bb) | 8 |
7 files changed, 40 insertions, 15 deletions
diff --git a/recipes-containers/containerd/containerd-docker_git.bb b/recipes-containers/containerd/containerd-docker_git.bb new file mode 100644 index 00000000..f6dcaeca --- /dev/null +++ b/recipes-containers/containerd/containerd-docker_git.bb | |||
@@ -0,0 +1,10 @@ | |||
1 | include containerd.inc | ||
2 | |||
3 | SRCREV = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e" | ||
4 | SRC_URI = "\ | ||
5 | git://github.com/docker/containerd.git;branch=docker-1.13.x \ | ||
6 | " | ||
7 | CONTAINERD_VERSION = "0.2.3" | ||
8 | |||
9 | PROVIDES += "virtual/containerd" | ||
10 | RPROVIDES_${PN} = "virtual/containerd" | ||
diff --git a/recipes-containers/containerd/containerd-opencontainers_git.bb b/recipes-containers/containerd/containerd-opencontainers_git.bb new file mode 100644 index 00000000..37f85472 --- /dev/null +++ b/recipes-containers/containerd/containerd-opencontainers_git.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | include containerd.inc | ||
2 | |||
3 | SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" | ||
4 | SRC_URI = "git://github.com/docker/containerd.git;nobranch=1 \ | ||
5 | " | ||
6 | CONTAINERD_VERSION = "0.2.2" | ||
7 | |||
8 | PROVIDES += "virtual/containerd" | ||
9 | RPROVIDES_${PN} = "virtual/containerd" | ||
diff --git a/recipes-containers/containerd/containerd_git.bb b/recipes-containers/containerd/containerd.inc index 67011a35..a128fbde 100644 --- a/recipes-containers/containerd/containerd_git.bb +++ b/recipes-containers/containerd/containerd.inc | |||
@@ -4,18 +4,12 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and | |||
4 | containerd leverages runC's advanced features such as seccomp and user namespace \ | 4 | containerd leverages runC's advanced features such as seccomp and user namespace \ |
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 | SRCREV = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e" | ||
8 | SRC_URI = "\ | ||
9 | git://github.com/docker/containerd.git;branch=docker-1.13.x \ | ||
10 | " | ||
11 | |||
12 | # Apache-2.0 for containerd | 7 | # Apache-2.0 for containerd |
13 | LICENSE = "Apache-2.0" | 8 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" |
15 | 10 | ||
16 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
17 | 12 | ||
18 | CONTAINERD_VERSION = "0.2.3" | ||
19 | PV = "${CONTAINERD_VERSION}+git${SRCREV}" | 13 | PV = "${CONTAINERD_VERSION}+git${SRCREV}" |
20 | 14 | ||
21 | DEPENDS = "go-cross-${TARGET_ARCH} \ | 15 | DEPENDS = "go-cross-${TARGET_ARCH} \ |
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb index 46ad26e9..c8ab45a0 100644 --- a/recipes-containers/docker/docker_git.bb +++ b/recipes-containers/docker/docker_git.bb | |||
@@ -63,7 +63,8 @@ DEPENDS_append_class-target = "lvm2" | |||
63 | RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ | 63 | RDEPENDS_${PN} = "curl aufs-util git util-linux iptables \ |
64 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ | 64 | ${@bb.utils.contains('DISTRO_FEATURES','systemd','','cgroup-lite',d)} \ |
65 | " | 65 | " |
66 | RDEPENDS_${PN} += "containerd runc" | 66 | RDEPENDS_${PN} += "virtual/containerd virtual/runc" |
67 | |||
67 | RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" | 68 | RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" |
68 | RSUGGESTS_${PN} = "lxc docker-registry rt-tests" | 69 | RSUGGESTS_${PN} = "lxc docker-registry rt-tests" |
69 | DOCKER_PKG="github.com/docker/docker" | 70 | DOCKER_PKG="github.com/docker/docker" |
diff --git a/recipes-containers/runc/runc-docker_git.bb b/recipes-containers/runc/runc-docker_git.bb new file mode 100644 index 00000000..96d48cae --- /dev/null +++ b/recipes-containers/runc/runc-docker_git.bb | |||
@@ -0,0 +1,11 @@ | |||
1 | include runc.inc | ||
2 | |||
3 | # Note: this rev is before the required protocol field, update when all components | ||
4 | # have been updated to match. | ||
5 | SRCREV = "2f7393a47307a16f8cee44a37b262e8b81021e3e" | ||
6 | SRC_URI = "git://github.com/docker/runc.git;nobranch=1 \ | ||
7 | " | ||
8 | |||
9 | RUNC_VERSION = "1.0.0-rc2" | ||
10 | PROVIDES += "virtual/runc" | ||
11 | RPROVIDES_${PN} = "virtual/runc" | ||
diff --git a/recipes-containers/runc/runc-opencontainers_git.bb b/recipes-containers/runc/runc-opencontainers_git.bb new file mode 100644 index 00000000..a302d4b5 --- /dev/null +++ b/recipes-containers/runc/runc-opencontainers_git.bb | |||
@@ -0,0 +1,8 @@ | |||
1 | include runc.inc | ||
2 | |||
3 | SRCREV = "1cdaa709f151b61cee2bdaa09d8e5d2b58a8ba72" | ||
4 | SRC_URI = "git://github.com/opencontainers/runc;branch=master \ | ||
5 | " | ||
6 | RUNC_VERSION = "1.0.0-rc1" | ||
7 | PROVIDES += "virtual/runc" | ||
8 | RPROVIDES_${PN} = "virtual/runc" | ||
diff --git a/recipes-containers/runc/runc_git.bb b/recipes-containers/runc/runc.inc index c5cf40be..7626dad7 100644 --- a/recipes-containers/runc/runc_git.bb +++ b/recipes-containers/runc/runc.inc | |||
@@ -2,20 +2,12 @@ HOMEPAGE = "https://github.com/opencontainers/runc" | |||
2 | SUMMARY = "runc container cli tools" | 2 | SUMMARY = "runc container cli tools" |
3 | DESCRIPTION = "runc is a CLI tool for spawning and running containers according to the OCI specification." | 3 | DESCRIPTION = "runc is a CLI tool for spawning and running containers according to the OCI specification." |
4 | 4 | ||
5 | # Note: this rev is before the required protocol field, update when all components | ||
6 | # have been updated to match. | ||
7 | SRCREV = "2f7393a47307a16f8cee44a37b262e8b81021e3e" | ||
8 | SRC_URI = "\ | ||
9 | git://github.com/docker/runc.git;nobranch=1 \ | ||
10 | " | ||
11 | |||
12 | # Apache-2.0 for containerd | 5 | # Apache-2.0 for containerd |
13 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8" |
15 | 8 | ||
16 | S = "${WORKDIR}/git" | 9 | S = "${WORKDIR}/git" |
17 | 10 | ||
18 | RUNC_VERSION = "1.0.0-rc2" | ||
19 | PV = "${RUNC_VERSION}+git${SRCREV}" | 11 | PV = "${RUNC_VERSION}+git${SRCREV}" |
20 | 12 | ||
21 | DEPENDS = "go-cross-${TARGET_ARCH} \ | 13 | DEPENDS = "go-cross-${TARGET_ARCH} \ |