diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-29 17:09:31 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-04-29 17:09:31 -0400 |
commit | 9d98a04b2646cfc1db9dc36e628ebdced7cff2d9 (patch) | |
tree | b2ea2fd19c84870856af33d504402f99345108cf /recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch | |
parent | cd5eead051128154bf8efa88c15b18b4e29340e2 (diff) | |
download | meta-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/docker-ce/0001-build-use-build-script-without-docker.patch')
-rw-r--r-- | recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch b/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch deleted file mode 100644 index 070ebd63..00000000 --- a/recipes-containers/docker/docker-ce/0001-build-use-build-script-without-docker.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 45d03c7b04353d2e5955e573bc1063fcb0647a0c Mon Sep 17 00:00:00 2001 | ||
2 | From: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
3 | Date: Thu, 15 Apr 2021 16:30:37 -0400 | ||
4 | Subject: [PATCH] build: use build script without docker | ||
5 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> | ||
7 | --- | ||
8 | git/src/import/components/cli/Makefile | 2 +- | ||
9 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | |||
11 | diff --git git/src/import/components/cli/Makefile git/src/import/components/cli/Makefile | ||
12 | index 9e62210c33..9c7631f674 100644 | ||
13 | --- git/src/import/components/cli/Makefile | ||
14 | +++ git/src/import/components/cli/Makefile | ||
15 | @@ -51,7 +51,7 @@ plugins-osx: ## build example CLI plugins for macOS | ||
16 | |||
17 | .PHONY: dynbinary | ||
18 | dynbinary: ## build dynamically linked binary | ||
19 | - USE_GLIBC=1 docker buildx bake dynbinary | ||
20 | + GO_LINKMODE=dynamic ./scripts/build/binary | ||
21 | |||
22 | vendor: vendor.conf ## check that vendor matches vendor.conf | ||
23 | rm -rf vendor | ||
24 | -- | ||
25 | 2.19.1 | ||
26 | |||