summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker_git.bb
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-containers/docker/docker_git.bb')
-rw-r--r--recipes-containers/docker/docker_git.bb14
1 files changed, 10 insertions, 4 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index c1b38dce..acb17709 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -18,11 +18,13 @@ DESCRIPTION = "Linux container runtime \
18 subtle and/or glaring issues. \ 18 subtle and/or glaring issues. \
19 " 19 "
20 20
21SRCREV_docker = "49bf474f9ed7ce7143a59d1964ff7b7fd9b52178" 21SRCREV_docker = "e639a70fbe999d96354a5bcf560231b7b8aa935c"
22SRCREV_libnetwork="0f534354b813003a754606689722fe253101bc4e" 22SRCREV_libnetwork = "26addf43a5d925ff79d262dbbdb5344bc2b6e198"
23SRCREV_cli = "a765218f1988e85b68aa3977f34893ec7b059a60"
23SRC_URI = "\ 24SRC_URI = "\
24 git://github.com/docker/docker.git;nobranch=1;name=docker \ 25 git://github.com/moby/moby.git;nobranch=1;name=docker \
25 git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork \ 26 git://github.com/docker/libnetwork.git;branch=master;name=libnetwork;destsuffix=libnetwork \
27 git://github.com/docker/cli;branch=master;name=cli;destsuffix=cli \
26 file://docker.init \ 28 file://docker.init \
27 file://hi.Dockerfile \ 29 file://hi.Dockerfile \
28 file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \ 30 file://context-use-golang.org-x-net-pkg-until-we-move-to-go.patch \
@@ -30,7 +32,7 @@ SRC_URI = "\
30 32
31# Apache-2.0 for docker 33# Apache-2.0 for docker
32LICENSE = "Apache-2.0" 34LICENSE = "Apache-2.0"
33LIC_FILES_CHKSUM = "file://LICENSE;md5=aadc30f9c14d876ded7bedc0afd2d3d7" 35LIC_FILES_CHKSUM = "file://LICENSE;md5=9740d093a080530b5c5c6573df9af45a"
34 36
35S = "${WORKDIR}/git" 37S = "${WORKDIR}/git"
36 38
@@ -86,6 +88,7 @@ do_compile() {
86 88
87 mkdir -p .gopath/src/github.com/docker 89 mkdir -p .gopath/src/github.com/docker
88 ln -sf ../../../../../libnetwork .gopath/src/github.com/docker/libnetwork 90 ln -sf ../../../../../libnetwork .gopath/src/github.com/docker/libnetwork
91 ln -sf ../../../../../cli .gopath/src/github.com/docker/cli
89 92
90 export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go" 93 export GOPATH="${S}/.gopath:${S}/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
91 export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go" 94 export GOROOT="${STAGING_DIR_NATIVE}/${nonarch_libdir}/${HOST_SYS}/go"
@@ -107,6 +110,9 @@ do_compile() {
107 110
108 # build the proxy 111 # build the proxy
109 go build -o ${S}/docker-proxy github.com/docker/libnetwork/cmd/proxy 112 go build -o ${S}/docker-proxy github.com/docker/libnetwork/cmd/proxy
113
114 # build the cli
115 go build -o ${S}/bundles/latest/dynbinary-client/docker github.com/docker/cli/cmd/docker
110} 116}
111 117
112SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}" 118SYSTEMD_PACKAGES = "${@bb.utils.contains('DISTRO_FEATURES','systemd','${PN}','',d)}"