From 935e3d969ef1c0ce2f2a2719c31285be6114c8f9 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 2 Apr 2018 00:43:50 -0400 Subject: containerd: uprev to v1.0.2 Uprev containerd to v1.0.2 for compatibility with recent docker (18.04+) builds. With this uprev we also significantly restructure the build to use more of the latest oe-core go build infrastructure, but non-standard parts of the build remain. We also allow containerd to be build with CGO enabled to avoid linkage errors with the oe provided go build infrastructure. Signed-off-by: Bruce Ashfield --- .../0001-containerd-shim-build-with-CGO.patch | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch (limited to 'recipes-containers/containerd/files') diff --git a/recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch b/recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch new file mode 100644 index 00000000..3b890834 --- /dev/null +++ b/recipes-containers/containerd/files/0001-containerd-shim-build-with-CGO.patch @@ -0,0 +1,26 @@ +From a1d2db9037b1302c4ce4cfc170a4fa443f68e594 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Thu, 29 Mar 2018 15:48:41 -0400 +Subject: [PATCH] containerd-shim: build with CGO + +Signed-off-by: Bruce Ashfield +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/import/Makefile b/src/import/Makefile +index 9d8cf8a18fbc..1dff4e3c2043 100644 +--- a/src/import/Makefile ++++ b/src/import/Makefile +@@ -134,7 +134,7 @@ bin/%: cmd/% FORCE + + bin/containerd-shim: cmd/containerd-shim FORCE # set !cgo and omit pie for a static shim build: https://github.com/golang/go/issues/17789#issuecomment-258542220 + @echo "$(WHALE) bin/containerd-shim" +- @CGO_ENABLED=0 go build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim ++ @go build -o bin/containerd-shim ${SHIM_GO_LDFLAGS} ${GO_TAGS} ./cmd/containerd-shim + + binaries: $(BINARIES) ## build binaries + @echo "$(WHALE) $@" +-- +2.4.0.53.g8440f74 + -- cgit v1.2.3-54-g00ecf