From 3e58f7b1b880c0625b99216e2e5a1f86aad12b51 Mon Sep 17 00:00:00 2001 From: sbwml Date: Thu, 3 Jul 2025 14:51:46 +0800 Subject: [PATCH] containerd: sync upstream Signed-off-by: sbwml --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dbb40d5..66d985a 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ PKG_HASH:=374f1c906b409cfad142b20d208f99e9539e5eb47fbb47ea541b4dfc9867345f PKG_MAINTAINER:=Gerard Ryan -PKG_BUILD_DEPENDS:=golang/host +PKG_BUILD_DEPENDS:=golang/host dockerd PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 PKG_BUILD_FLAGS:=no-mips16 @@ -21,7 +21,7 @@ PKG_BUILD_FLAGS:=no-mips16 GO_PKG:=github.com/containerd/containerd include $(INCLUDE_DIR)/package.mk -include ../../lang/golang/golang-package.mk +include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/containerd SECTION:=utils @@ -36,8 +36,11 @@ 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 +GO_PKG_INSTALL_EXTRA:=\ + vendor/google.golang.org/protobuf/internal/editiondefaults/editions_defaults.binpb \ + Makefile \ + vendor/modules.txt + MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_VARS += $(GO_PKG_VARS) MAKE_FLAGS += \