Re: [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT

["Bruce Ashfield" <bruce.ashfield@gmail.com>]

In message: [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT
on 03/03/2020 Martin Jansa wrote:

> * SRCREV_docker isn't defined in docker-moby recipes at all
>   so it passes unexpanded ${SRCREV_docker} as noticed in
>   error log:
> 
>   | ERROR: Execution of 'work/raspberrypi4-oe-linux-gnueabi/docker-moby/19.03.6+git71373c6105e3cbc9702935b96d8ee01214c405e7-r0/temp/run.do_compile.31754' failed with exit code 2:
>   |
>   | Package devmapper was not found in the pkg-config search path.
>   | Perhaps you should add the directory containing `devmapper.pc'
>   | to the PKG_CONFIG_PATH environment variable
>   | No package 'devmapper' found
>   | Removing bundles/
>   |
>   | ---> Making bundle: dynbinary (in bundles/dynbinary)
>   | Building: bundles/dynbinary-daemon/dockerd-19.03.6
>   | GOOS="linux" GOARCH="arm" GOARM="7"
>   | # runtime/cgo
>   | exec: "arm-linux-gnueabihf-gcc": executable file not found in $PATH
>   | WARNING: work/raspberrypi4-oe-linux-gnueabi/docker-moby/19.03.6+git71373c6105e3cbc9702935b96d8ee01214c405e7-r0/temp/run.do_compile.31754:1 exit 2 from 'VERSION="19.03.6" DOCKER_GITCOMMIT="${SRCREV_docker}" ./hack/make.sh dynbinary'
>   | ERROR: Task (meta-virtualization/recipes-containers/docker/docker-moby.bb:do_compile) failed with exit code '1'
> 
>   this build issue is somehow caused by recent upgrade:
>   http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=f770151b3ff0938bea4972abdd1ee7f6cbc3a074
>   and this build error is not fixed by this change, but
>   see 2nd to last line which shows
>   DOCKER_GITCOMMIT="${SRCREV_docker}"

.. and even stranger, the x86 builds are unconcerned with this, since runtime
testing passed.

Definitely wrong though, and this is merged.

Bruce

> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-containers/docker/docker-moby.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
> index b29c4b3..a8c5946 100644
> --- a/recipes-containers/docker/docker-moby.bb
> +++ b/recipes-containers/docker/docker-moby.bb
> @@ -101,14 +101,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_docker}" ./hack/make.sh dynbinary
> +	VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" ./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_docker}" make dynbinary
> +	VERSION="${DOCKER_VERSION}" DOCKER_GITCOMMIT="${SRCREV_moby}" make dynbinary
>  
>  	# build the proxy
>  	cd ${S}/src/import/.gopath/src/github.com/docker/libnetwork
> -- 
> 2.20.1
> 

>