NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/docker-containerd: specify correct build targets

Browse Source 
Adds build targets for runc shims.

Removes the outdated and now unnecessary symlinks to docker-runc
docker-containerd etc as well.

Signed-off-by: Christian Stewart <christian@paral.in>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Christian Stewart 2020-12-16 00:00:10 -08:00 committed by Thomas Petazzoni
parent 9e12516f2a
commit 9242d4df12
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/docker-containerd/docker-containerd.mk
View File

@ -14,9 +14,14 @@ DOCKER_CONTAINERD_GOMOD = github.com/containerd/containerd
DOCKER_CONTAINERD_LDFLAGS = \
-X $(DOCKER_CONTAINERD_GOMOD)/version.Version=$(DOCKER_CONTAINERD_VERSION)
DOCKER_CONTAINERD_BUILD_TARGETS = cmd/ctr cmd/containerd cmd/containerd-shim
DOCKER_CONTAINERD_BUILD_TARGETS = \
cmd/containerd \
cmd/containerd-shim \
cmd/containerd-shim-runc-v1 \
cmd/containerd-shim-runc-v2 \
cmd/ctr
DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
DOCKER_CONTAINERD_INSTALL_BINS = $(notdir $(DOCKER_CONTAINERD_BUILD_TARGETS))
ifeq ($(BR2_PACKAGE_LIBAPPARMOR),y)
DOCKER_CONTAINERD_DEPENDENCIES += libapparmor
@ -34,12 +39,4 @@ else
DOCKER_CONTAINERD_TAGS += no_btrfs
endif
define DOCKER_CONTAINERD_INSTALL_SYMLINKS
ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc
ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim
ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd
endef
DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS += DOCKER_CONTAINERD_INSTALL_SYMLINKS
$(eval $(golang-package))