summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker-ce_git.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-06-30 23:21:42 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-07-01 12:43:16 -0400
commit929372946aeb85953d1ca6acc428d73fbac52a56 (patch)
tree8198a14178180fc5c522a7a4756e74938497555f /recipes-containers/docker/docker-ce_git.bb
parent9726c5d16420c525afe6045665c6aeaf424d9cc6 (diff)
downloadmeta-virtualization-929372946aeb85953d1ca6acc428d73fbac52a56.tar.gz
docker-ce/docker-moby: fixup GO compiler calls
With oe-core commit c23f9e80492e4b [tcmode-default: use go-binary-native by default], we must explictly call the proper cross go binary, versus just the go-native variant. These builds were working by luck, since the go compiler was capable of building the target binaries previously (in its build-from-source creation). We fixup the calls and we no longer see fpu build issues: fatal error: gnu/stubs-soft.h: No such file or directory 7 | # include <gnu/stubs-soft.h> | ^~~~~~~~~~~~~~~~~~ This commit also moves the docker-ce patches from "files" to a named directory to reduce confusion. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/docker-ce_git.bb')
-rw-r--r--recipes-containers/docker/docker-ce_git.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-containers/docker/docker-ce_git.bb b/recipes-containers/docker/docker-ce_git.bb
index 9147e7b6..2140c243 100644
--- a/recipes-containers/docker/docker-ce_git.bb
+++ b/recipes-containers/docker/docker-ce_git.bb
@@ -26,6 +26,8 @@ SRC_URI = "\
26 file://0001-libnetwork-use-GO-instead-of-go.patch \ 26 file://0001-libnetwork-use-GO-instead-of-go.patch \
27 file://docker.init \ 27 file://docker.init \
28 file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \ 28 file://0001-imporve-hardcoded-CC-on-cross-compile-docker-ce.patch \
29 file://0001-dynbinary-use-go-cross-compiler.patch \
30 file://0001-cli-use-go-cross-compiler.patch \
29 " 31 "
30 32
31require docker.inc 33require docker.inc