diff options
| author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-14 15:04:38 -0400 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-09-14 16:00:43 -0400 |
| commit | a83bc2b936516167d501bf269bfcb87ae5afb6ad (patch) | |
| tree | fa0a7214f4699bc3ac4a44bb29b1223923fad20a | |
| parent | 1d9e1bd99db93c1394f51f59dd3e2a3dec15c04d (diff) | |
| download | meta-virtualization-a83bc2b936516167d501bf269bfcb87ae5afb6ad.tar.gz | |
docker-distribution: adjust to new go.bbclass
We want to build in ${S}, so we now require an explicit cd ${S}
to avoid landing in the build directory.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
| -rw-r--r-- | recipes-containers/docker-distribution/docker-distribution_git.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/recipes-containers/docker-distribution/docker-distribution_git.bb b/recipes-containers/docker-distribution/docker-distribution_git.bb index e2eac2ea..add5ce1d 100644 --- a/recipes-containers/docker-distribution/docker-distribution_git.bb +++ b/recipes-containers/docker-distribution/docker-distribution_git.bb | |||
| @@ -13,6 +13,8 @@ PACKAGES =+ "docker-registry" | |||
| 13 | PV = "v2.6.2" | 13 | PV = "v2.6.2" |
| 14 | S = "${WORKDIR}/git/src/github.com/docker/distribution" | 14 | S = "${WORKDIR}/git/src/github.com/docker/distribution" |
| 15 | 15 | ||
| 16 | GO_IMPORT = "import" | ||
| 17 | |||
| 16 | inherit goarch | 18 | inherit goarch |
| 17 | inherit go | 19 | inherit go |
| 18 | 20 | ||
| @@ -33,6 +35,8 @@ do_compile() { | |||
| 33 | export GO_GCFLAGS="" | 35 | export GO_GCFLAGS="" |
| 34 | export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" | 36 | export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" |
| 35 | 37 | ||
| 38 | cd ${S} | ||
| 39 | |||
| 36 | oe_runmake binaries | 40 | oe_runmake binaries |
| 37 | } | 41 | } |
| 38 | 42 | ||
