summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker
diff options
context:
space:
mode:
authorAmy Fong <amy.fong@windriver.com>2015-10-06 14:41:13 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-10-13 11:29:57 -0400
commitd0ef47396d1ea7c67b27898f6d0401cbcef45281 (patch)
tree7cd0dae545e97c5a278e4961db6811026aa053e5 /recipes-containers/docker
parent7817649098ea61e8d3e31600a589e856fc254006 (diff)
downloadmeta-virtualization-d0ef47396d1ea7c67b27898f6d0401cbcef45281.tar.gz
Enable go-cross 1.3 to coexist with later versions
Since we need go 1.3 to co-exist with later versions (ie 1.4), package go-cross_1.3 as go-cross-1.3_1.3. go 1.3 will be installed to a different path than go-cross, this requires go packages needing go 1.3 to set its PATH to: export PATH=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/go-1.3:$PATH Signed-off-by: Amy Fong <amy.fong@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker')
-rw-r--r--recipes-containers/docker/docker_git.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 46714fef..69c45ae3 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -37,7 +37,7 @@ S = "${WORKDIR}/git"
37DOCKER_VERSION = "1.6.2" 37DOCKER_VERSION = "1.6.2"
38PV = "${DOCKER_VERSION}+git${SRCREV}" 38PV = "${DOCKER_VERSION}+git${SRCREV}"
39 39
40DEPENDS = "go-cross \ 40DEPENDS = "go-cross-1.3 \
41 go-cli \ 41 go-cli \
42 go-pty \ 42 go-pty \
43 go-context \ 43 go-context \
@@ -66,6 +66,8 @@ do_configure() {
66} 66}
67 67
68do_compile() { 68do_compile() {
69 export PATH=${STAGING_BINDIR_NATIVE}/${HOST_SYS}/go-1.3:$PATH
70
69 export GOARCH="${TARGET_ARCH}" 71 export GOARCH="${TARGET_ARCH}"
70 # supported amd64, 386, arm 72 # supported amd64, 386, arm
71 if [ "${TARGET_ARCH}" = "x86_64" ]; then 73 if [ "${TARGET_ARCH}" = "x86_64" ]; then