From 9d98a04b2646cfc1db9dc36e628ebdced7cff2d9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 29 Apr 2021 17:09:31 -0400 Subject: 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 --- .../0001-dynbinary-use-go-cross-compiler.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch (limited to 'recipes-containers/docker/files/0001-dynbinary-use-go-cross-compiler.patch') 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 @@ +From bbf600cc4d46c3f7ec0c1b486790a2402d41f550 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Tue, 30 Jun 2020 22:23:33 -0400 +Subject: [PATCH] dynbinary: use go cross compiler + +Signed-off-by: Bruce Ashfield +--- + hack/make/.binary | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: git/src/import/hack/make/.binary +=================================================================== +--- git.orig/src/import/hack/make/.binary ++++ git/src/import/hack/make/.binary +@@ -81,7 +81,7 @@ + + echo "Building: $DEST/$BINARY_FULLNAME" + echo "GOOS=\"${GOOS}\" GOARCH=\"${GOARCH}\" GOARM=\"${GOARM}\"" +- go build \ ++ ${GO} build \ + -o "$DEST/$BINARY_FULLNAME" \ + "${BUILDFLAGS[@]}" \ + -ldflags " -- cgit v1.2.3-54-g00ecf