summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-04-29 17:09:31 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-04-29 17:09:31 -0400
commit9d98a04b2646cfc1db9dc36e628ebdced7cff2d9 (patch)
treeb2ea2fd19c84870856af33d504402f99345108cf /recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
parentcd5eead051128154bf8efa88c15b18b4e29340e2 (diff)
downloadmeta-virtualization-9d98a04b2646cfc1db9dc36e628ebdced7cff2d9.tar.gz
docker: unify common parts of docker-ce and docker-moby recipes
Now that docker-ce is being built from the same repos as docker-moby, the only unique things in the recipes are the SRCREVs. We move the common packaging, compile/install routines and configuration to the .inc files. We also move the patches to the generic 'files' directory, so they can be shared. If we there are SRCREV bumps in the future that diverge moby and docker, we'll hold patches in their named directorys and tweak the compile/install routines as necessary. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch')
-rw-r--r--recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
new file mode 100644
index 00000000..971c60d7
--- /dev/null
+++ b/recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch
@@ -0,0 +1,23 @@
1From bbf600cc4d46c3f7ec0c1b486790a2402d41f550 Mon Sep 17 00:00:00 2001
2From: Bruce Ashfield <bruce.ashfield@gmail.com>
3Date: Tue, 30 Jun 2020 22:23:33 -0400
4Subject: [PATCH] dynbinary: use go cross compiler
5
6Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
7---
8 hack/make/.binary | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11Index: git/src/import/hack/make/.binary
12===================================================================
13--- git.orig/src/import/hack/make/.binary
14+++ git/src/import/hack/make/.binary
15@@ -81,7 +81,7 @@
16
17 echo "Building: $DEST/$BINARY_FULLNAME"
18 echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\""
19- go build \
20+ ${GO} build \
21 -o "$DEST/$BINARY_FULLNAME" \
22 "${BUILDFLAGS[@]}" \
23 -ldflags "