* [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT
@ 2020-03-03 22:11 Martin Jansa
2020-03-03 22:11 ` [meta-virtualization][PATCH 2/2] docker-moby: fix build Martin Jansa
2020-03-04 1:02 ` [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Bruce Ashfield
0 siblings, 2 replies; 3+ messages in thread
From: Martin Jansa @ 2020-03-03 22:11 UTC (permalink / raw)
To: meta-virtualization; +Cc: Martin Jansa
* 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}"
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* [meta-virtualization][PATCH 2/2] docker-moby: fix build
2020-03-03 22:11 [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Martin Jansa
@ 2020-03-03 22:11 ` Martin Jansa
2020-03-04 1:02 ` [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2020-03-03 22:11 UTC (permalink / raw)
To: meta-virtualization; +Cc: Martin Jansa
* apply similar patch to what was applied to docker-ce in:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/recipes-containers/docker?id=e7787cb01be91d3798594687a475d5b085f29ede
it's very similar, but needs to be separate .patch file, because the
path to make/.binary is different in docker-ce and docker-moby.
since the recent upgrade:
http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/commit/?id=f770151b3ff0938bea4972abdd1ee7f6cbc3a074
docker-moby needs the same change or fails like this:
| 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'
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
recipes-containers/docker/docker-moby.bb | 1 +
...dcoded-CC-on-cross-compile-docker-ce.patch | 61 +++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
diff --git a/recipes-containers/docker/docker-moby.bb b/recipes-containers/docker/docker-moby.bb
index a8c5946..39bc263 100644
--- a/recipes-containers/docker/docker-moby.bb
+++ b/recipes-containers/docker/docker-moby.bb
@@ -44,6 +44,7 @@ SRC_URI = "\
git://github.com/docker/cli;branch=19.03;name=cli;destsuffix=git/cli \
file://docker.init \
file://0001-libnetwork-use-GO-instead-of-go.patch \
+ file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
"
require docker.inc
diff --git a/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch b/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
new file mode 100644
index 0000000..766425a
--- /dev/null
+++ b/recipes-containers/docker/docker-moby/0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch
@@ -0,0 +1,61 @@
+From 1263fdb50a540e9db742694b7cee08284ad986d0 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia@windriver.com>
+Date: Wed, 17 Jul 2019 17:34:04 +0800
+Subject: [PATCH] imporve hardcoded CC on cross compile
+
+Since commit applied in moby [61a3285 Support cross-compile for arm]
+it hardcoded var-CC to support cross-compile for arm
+
+Correct it with "${parameter:-word}" format, it is helpful for user
+define toolchains
+
+(Use Default Values. If parameter is unset or null, the expansion of
+word is substituted. Otherwise, the value of parameter is substituted.)
+
+Upstream-Status: Submitted [https://github.com/moby/moby/pull/39546]
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ components/engine/hack/make/.binary | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/import/hack/make/.binary b/src/import/hack/make/.binary
+index 53de6749e5..66f4ca05f3 100644
+--- a/src/import/hack/make/.binary
++++ b/src/import/hack/make/.binary
+@@ -44,27 +44,27 @@ if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARC
+ # must be cross-compiling!
+ case "$(go env GOOS)/$(go env GOARCH)" in
+ windows/amd64)
+- export CC=x86_64-w64-mingw32-gcc
++ export CC="${CC:-x86_64-w64-mingw32-gcc}"
+ export CGO_ENABLED=1
+ ;;
+ linux/arm)
+ case "${GOARM}" in
+ 5|"")
+- export CC=arm-linux-gnueabi-gcc
++ export CC="${CC:-arm-linux-gnueabi-gcc}"
+ export CGO_ENABLED=1
+ ;;
+ 7)
+- export CC=arm-linux-gnueabihf-gcc
++ export CC="${CC:-arm-linux-gnueabihf-gcc}"
+ export CGO_ENABLED=1
+ ;;
+ esac
+ ;;
+ linux/arm64)
+- export CC=aarch64-linux-gnu-gcc
++ export CC="${CC:-aarch64-linux-gnu-gcc}"
+ export CGO_ENABLED=1
+ ;;
+ linux/amd64)
+- export CC=x86_64-linux-gnu-gcc
++ export CC="${CC:-x86_64-linux-gnu-gcc}"
+ export CGO_ENABLED=1
+ ;;
+ esac
+--
+2.23.0
+
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT
2020-03-03 22:11 [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Martin Jansa
2020-03-03 22:11 ` [meta-virtualization][PATCH 2/2] docker-moby: fix build Martin Jansa
@ 2020-03-04 1:02 ` Bruce Ashfield
1 sibling, 0 replies; 3+ messages in thread
From: Bruce Ashfield @ 2020-03-04 1:02 UTC (permalink / raw)
To: Martin Jansa; +Cc: meta-virtualization
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
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-04 1:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-03 22:11 [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Martin Jansa
2020-03-03 22:11 ` [meta-virtualization][PATCH 2/2] docker-moby: fix build Martin Jansa
2020-03-04 1:02 ` [meta-virtualization][PATCH 1/2] docker-moby: fix DOCKER_GITCOMMIT Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.