mirror of
https://github.com/termux/termux-packages.git
synced 2024-11-27 05:08:56 +00:00
8680546c85
Seems newer versions of containerd does not work in termux, trying to run docker with containerd 1.6.24 or 1.7.7 we get: $ sudo docker run -it ubuntu bash docker: Error response from daemon: failed to create task for container: failed to start shim: start failed: io.containerd.runc.v2: create new shim socket: listen unix /data/data/com.termux/files/usr/var/run/containerd/s/3f71828f1d6c1ead43fded842abc9c3cf5857c74c3e0704cd83ab177e17cfe6c: bind: invalid argument: exit status 1: unknown.
37 lines
1.5 KiB
Diff
37 lines
1.5 KiB
Diff
--- ../cache/tmp-checkout/Makefile 2023-10-23 19:42:08.826348963 +0000
|
|
+++ ./Makefile 2023-10-23 19:48:19.356921771 +0000
|
|
@@ -81,7 +81,7 @@
|
|
PKG=github.com/containerd/containerd
|
|
|
|
# Project binaries.
|
|
-COMMANDS=ctr containerd containerd-stress
|
|
+COMMANDS=ctr containerd containerd-stress containerd-shim containerd-shim-runc-v1 containerd-shim-runc-v2
|
|
MANPAGES=ctr.8 containerd.8 containerd-config.8 containerd-config.toml.5
|
|
|
|
ifdef BUILDTAGS
|
|
@@ -100,7 +100,7 @@
|
|
endif
|
|
GO_LDFLAGS+='
|
|
|
|
-SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags "-static" $(EXTRA_LDFLAGS)'
|
|
+SHIM_GO_LDFLAGS=-ldflags '-X $(PKG)/version.Version=$(VERSION) -X $(PKG)/version.Revision=$(REVISION) -X $(PKG)/version.Package=$(PACKAGE) -extldflags $(EXTRA_LDFLAGS)'
|
|
|
|
# Project packages.
|
|
PACKAGES=$(shell $(GO) list ${GO_TAGS} ./... | grep -v /vendor/ | grep -v /integration)
|
|
@@ -274,11 +274,13 @@
|
|
|
|
man/containerd.8: FORCE
|
|
@echo "$(WHALE) $@"
|
|
- $(GO) run -mod=readonly ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
|
|
+ -CC=gcc CFLAGS= LDFLAGS= GOOS= GOARCH= $(GO) run -mod=readonly ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
|
|
+ touch $@
|
|
|
|
man/ctr.8: FORCE
|
|
@echo "$(WHALE) $@"
|
|
- $(GO) run -mod=readonly ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
|
|
+ -CC=gcc CFLAGS= LDFLAGS= GOOS= GOARCH= $(GO) run -mod=readonly ${GO_TAGS} cmd/gen-manpages/main.go $(@F) $(@D)
|
|
+ touch $@
|
|
|
|
man/%: docs/man/%.md FORCE
|
|
@echo "$(WHALE) $@"
|