diff options
Diffstat (limited to 'import-layers/meta-virtualization/recipes-containers/containerd')
-rw-r--r-- | import-layers/meta-virtualization/recipes-containers/containerd/containerd-docker_git.bb | 10 | ||||
-rw-r--r-- | import-layers/meta-virtualization/recipes-containers/containerd/containerd-opencontainers_git.bb | 9 | ||||
-rw-r--r-- | import-layers/meta-virtualization/recipes-containers/containerd/containerd.inc (renamed from import-layers/meta-virtualization/recipes-containers/containerd/containerd_git.bb) | 12 |
3 files changed, 22 insertions, 9 deletions
diff --git a/import-layers/meta-virtualization/recipes-containers/containerd/containerd-docker_git.bb b/import-layers/meta-virtualization/recipes-containers/containerd/containerd-docker_git.bb new file mode 100644 index 000000000..f6dcaeca9 --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/containerd/containerd-docker_git.bb @@ -0,0 +1,10 @@ +include containerd.inc + +SRCREV = "03e5862ec0d8d3b3f750e19fca3ee367e13c090e" +SRC_URI = "\ + git://github.com/docker/containerd.git;branch=docker-1.13.x \ + " +CONTAINERD_VERSION = "0.2.3" + +PROVIDES += "virtual/containerd" +RPROVIDES_${PN} = "virtual/containerd" diff --git a/import-layers/meta-virtualization/recipes-containers/containerd/containerd-opencontainers_git.bb b/import-layers/meta-virtualization/recipes-containers/containerd/containerd-opencontainers_git.bb new file mode 100644 index 000000000..37f85472f --- /dev/null +++ b/import-layers/meta-virtualization/recipes-containers/containerd/containerd-opencontainers_git.bb @@ -0,0 +1,9 @@ +include containerd.inc + +SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" +SRC_URI = "git://github.com/docker/containerd.git;nobranch=1 \ + " +CONTAINERD_VERSION = "0.2.2" + +PROVIDES += "virtual/containerd" +RPROVIDES_${PN} = "virtual/containerd" diff --git a/import-layers/meta-virtualization/recipes-containers/containerd/containerd_git.bb b/import-layers/meta-virtualization/recipes-containers/containerd/containerd.inc index c2000b1c5..b14397957 100644 --- a/import-layers/meta-virtualization/recipes-containers/containerd/containerd_git.bb +++ b/import-layers/meta-virtualization/recipes-containers/containerd/containerd.inc @@ -4,22 +4,15 @@ DESCRIPTION = "containerd is a daemon to control runC, built for performance and containerd leverages runC's advanced features such as seccomp and user namespace \ support as well as checkpoint and restore for cloning and live migration of containers." -SRCREV = "0ac3cd1be170d180b2baed755e8f0da547ceb267" -SRC_URI = "\ - git://github.com/docker/containerd.git;nobranch=1 \ - " - # Apache-2.0 for containerd LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.code;md5=aadc30f9c14d876ded7bedc0afd2d3d7" S = "${WORKDIR}/git" -CONTAINERD_VERSION = "0.2.2" PV = "${CONTAINERD_VERSION}+git${SRCREV}" -DEPENDS = "go-cross \ - " +inherit go RRECOMMENDS_${PN} = "lxc docker" CONTAINERD_PKG="github.com/docker/containerd" @@ -47,6 +40,7 @@ do_compile() { mkdir -p .gopath/src/"$(dirname "${CONTAINERD_PKG}")" ln -sf ../../../.. .gopath/src/"${CONTAINERD_PKG}" export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" + export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" cd - # Pass the needed cflags/ldflags so that cgo @@ -86,6 +80,6 @@ do_install() { fi } -FILES_${PN} += "/lib/systemd/system/*" +FILES_${PN} += "${systemd_system_unitdir}/*" INHIBIT_PACKAGE_STRIP = "1" |