From: Bruce Ashfield <[email protected]> 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 <[email protected]> --- recipes-containers/docker/docker-ce_git.bb | 2 ++ recipes-containers/docker/docker-moby_git.bb | 2 ++ recipes-containers/docker/docker.inc | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb index b86596c..4561687 100644 --- a/recipes-containers/docker/docker-ce_git.bb +++ b/recipes-containers/docker/docker-ce_git.bb @@ -45,6 +45,8 @@ SRC_URI = "\ file://0001-cli-use-external-GO111MODULE-and-cross-compiler.patch \ " +DOCKER_COMMIT = "${SRCREV_docker}" + require docker.inc # Apache-2.0 for docker diff --git a/recipes-containers/docker/docker-moby_git.bb b/recipes-containers/docker/docker-moby_git.bb index e687cec..8a35290 100644 --- a/recipes-containers/docker/docker-moby_git.bb +++ b/recipes-containers/docker/docker-moby_git.bb @@ -48,6 +48,8 @@ SRC_URI = "\ file://0001-dynbinary-use-go-cross-compiler.patch \ " +DOCKER_COMMIT = "${SRCREV_moby}" + require docker.inc # Apache-2.0 for docker diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index b74b412..2487456 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -97,14 +97,14 @@ do_compile() { # this is the unsupported built structure # that doesn't rely on an existing docker # to build this: - VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" ./hack/make.sh dynbinary + VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" ./hack/make.sh dynbinary # build the cli cd ${S}/src/import/.gopath/src/github.com/docker/cli export CFLAGS="" export LDFLAGS="" export DOCKER_VERSION=${DOCKER_VERSION} - VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" make dynbinary + VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${DOCKER_COMMIT}" make dynbinary # build the proxy cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork -- 2.38.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#7772): https://lists.yoctoproject.org/g/meta-virtualization/message/7772 Mute This Topic: https://lists.yoctoproject.org/mt/95617048/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
