From 751715e8242d3e3d644e26784baeb652f9ccac84 Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Wed, 24 Feb 2021 15:37:59 -0300 Subject: [PATCH] containerd: fix build with golang 1.16 Add GO111MODULE=auto to GO_PKG_BUILD_VARS to allow the package to be built in non-module mode. Module-aware mode will be mandatory in the next golang release. Signed-off-by: Eneas U de Queiroz (cherry picked from commit 2d48a7b6e0a5d73962a7cf4bd32a80c762d2f35b) --- utils/containerd/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index dcf3482344..3ab6499941 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd PKG_VERSION:=1.4.3 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE @@ -36,6 +36,7 @@ define Package/containerd/description An industry-standard container runtime with an emphasis on simplicity, robustness and portability endef +GO_PKG_BUILD_VARS += GO111MODULE=auto GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_VARS += $(GO_PKG_VARS) -- 2.30.2