diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-12-07 16:40:04 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-12-07 16:40:04 -0500 |
commit | d3acb1a378e644fe2784a8357390b19695640f78 (patch) | |
tree | 7d80c068ec2b9755f008f265f1fb18c688c76bf6 /recipes-containers/docker/docker.inc | |
parent | e675e3ebbfaf42686076fdf31562d499e3f6d189 (diff) | |
download | meta-virtualization-d3acb1a378e644fe2784a8357390b19695640f78.tar.gz |
docker/moby: use generic DOCKER_COMMIT in do_compile
do_compile() is shared and shouldn't have been using SRCREV_moby
as that is obviously only set in the moby recipe.
Switch to using a generic DOCKER_COMMIT variable and set it in
both docker_moby and docker-ce.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/docker.inc')
-rw-r--r-- | recipes-containers/docker/docker.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index b74b4123..2487456e 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc | |||
@@ -97,14 +97,14 @@ do_compile() { | |||
97 | # this is the unsupported built structure | 97 | # this is the unsupported built structure |
98 | # that doesn't rely on an existing docker | 98 | # that doesn't rely on an existing docker |
99 | # to build this: | 99 | # to build this: |
100 | VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" ./hack/make.sh dynbinary | 100 | VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" ./hack/make.sh dynbinary |
101 | 101 | ||
102 | # build the cli | 102 | # build the cli |
103 | cd ${S}/src/import/.gopath/src/github.com/docker/cli | 103 | cd ${S}/src/import/.gopath/src/github.com/docker/cli |
104 | export CFLAGS="" | 104 | export CFLAGS="" |
105 | export LDFLAGS="" | 105 | export LDFLAGS="" |
106 | export DOCKER_VERSION=${DOCKER_VERSION} | 106 | export DOCKER_VERSION=${DOCKER_VERSION} |
107 | VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" make dynbinary | 107 | VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary |
108 | 108 | ||
109 | # build the proxy | 109 | # build the proxy |
110 | cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork | 110 | cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork |