From 083bc446c93ad6a130b90e937310e3c63647399d Mon Sep 17 00:00:00 2001 From: Beginner-Go <70857188+Beginner-Go@users.noreply.github.com> Date: Thu, 4 Mar 2021 14:01:48 +0000 Subject: [PATCH] runc: fixed compiler error --- utils/containerd/Makefile | 43 ++++++++++------------------------- utils/runc/Makefile | 48 ++++++++++++--------------------------- 2 files changed, 27 insertions(+), 64 deletions(-) diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile index 9afce542..3ab64999 100644 --- a/utils/containerd/Makefile +++ b/utils/containerd/Makefile @@ -1,45 +1,34 @@ include $(TOPDIR)/rules.mk PKG_NAME:=containerd -PKG_VERSION:=1.2.13 -PKG_RELEASE:=1 +PKG_VERSION:=1.4.3 +PKG_RELEASE:=4 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/containerd/containerd/tar.gz/v${PKG_VERSION}? -PKG_HASH:=0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 -PKG_SOURCE_VERSION:=7ad184331fa3e55e52b890ea95e65ba581ae3429 +PKG_HASH:=bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 +PKG_SOURCE_VERSION:=269548fa27e0089a8b8278fc4fc781d7f65a939b PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 +PKG_USE_MIPS16:=0 GO_PKG:=github.com/containerd/containerd include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk -define Package/containerd/config -config CONTAINERD_SECCOMP - depends on PACKAGE_containerd - bool "Enable support for seccomp in containerd" - default DOCKER_SECCOMP - select KERNEL_SECCOMP - select PACKAGE_libseccomp - help - Build containerd with support for seccomp filters. - Select libseccomp which also pulls-in the needed kernel features. -endef - define Package/containerd SECTION:=utils CATEGORY:=Utilities TITLE:=containerd container runtime URL:=https://containerd.io/ - DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +btrfs-progs +runc +CONTAINERD_SECCOMP:libseccomp + DEPENDS:=$(GO_ARCH_DEPENDS) +btrfs-progs +runc MENU:=1 endef @@ -47,34 +36,26 @@ 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) MAKE_FLAGS += \ - DESTDIR="$(PKG_INSTALL_DIR)" \ VERSION=$(PKG_VERSION) \ REVISION=$(PKG_SOURCE_VERSION) -ifeq ($(CONFIG_CONTAINERD_SECCOMP),y) -MAKE_FLAGS += BUILDTAGS='seccomp' +ifeq ($(CONFIG_SELINUX),y) +MAKE_FLAGS += BUILDTAGS='selinux' else MAKE_FLAGS += BUILDTAGS='' endif -define Build/Compile - $(call Build/Compile/Default) -endef - -# Avoid installing binaries -define Build/InstallDev - $(call Build/Compile/Default,clean) - rm -f $(STAMP_BUILT) - $(call GoPackage/Build/InstallDev,$(1)) -endef +# Reset golang-package.mk overrides so we can use the Makefile +Build/Compile=$(call Build/Compile/Default) define Package/containerd/install $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/{ctr,containerd,containerd-stress,containerd-shim} $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/{ctr,containerd,containerd-stress,containerd-shim,containerd-shim-runc-v1,containerd-shim-runc-v2} $(1)/usr/bin/ endef $(eval $(call BuildPackage,containerd)) diff --git a/utils/runc/Makefile b/utils/runc/Makefile index 605b852b..c4de6fb4 100644 --- a/utils/runc/Makefile +++ b/utils/runc/Makefile @@ -1,20 +1,21 @@ include $(TOPDIR)/rules.mk PKG_NAME:=runc -PKG_VERSION:=1.0.0-rc10 +PKG_VERSION:=1.0.0-rc93 PKG_RELEASE:=1 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/opencontainers/runc/tar.gz/v${PKG_VERSION}? -PKG_HASH:=6b44985023347fb9c5a2cc6f761df8c41cc2c84a7a68a6e6acf834dff6653a9a -PKG_SOURCE_VERSION:=dc9208a3303feef5b3839f4323d9beb36df0a9dd +PKG_HASH:=e42456078d2f76c925cdd656e4f423b918525d8188521de05e893b6bb473a6f8 +PKG_SOURCE_VERSION:=12644e614e25b05da6fd08a38ffa0cfe1903fdec PKG_MAINTAINER:=Gerard Ryan PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 +PKG_INSTALL:=1 PKG_USE_MIPS16:=0 GO_PKG:=github.com/opencontainers/runc @@ -22,25 +23,12 @@ GO_PKG:=github.com/opencontainers/runc include $(INCLUDE_DIR)/package.mk include ../../lang/golang/golang-package.mk -define Package/runc/config -config RUNC_SECCOMP - depends on PACKAGE_runc - bool "Enable support for seccomp in runc" - default DOCKER_SECCOMP - select KERNEL_SECCOMP - select PACKAGE_libseccomp - help - Build runc with support for seccomp filters. - Select libseccomp which also pulls-in the needed kernel features. -endef - define Package/runc SECTION:=utils CATEGORY:=Utilities TITLE:=runc container runtime URL:=https://www.opencontainers.org/ - DEPENDS:=$(GO_ARCH_DEPENDS) @(aarch64||arm||x86_64) +RUNC_SECCOMP:libseccomp - MENU:=1 + DEPENDS:=$(GO_ARCH_DEPENDS) +KERNEL_SECCOMP_FILTER:libseccomp endef define Package/runc/description @@ -50,29 +38,23 @@ endef GO_PKG_INSTALL_ALL:=1 MAKE_PATH:=$(GO_PKG_WORK_DIR_NAME)/build/src/$(GO_PKG) MAKE_VARS += $(GO_PKG_VARS) -MAKE_FLAGS += \ - COMMIT=$(PKG_SOURCE_VERSION) +MAKE_FLAGS += COMMIT=$(PKG_SOURCE_VERSION) ifeq ($(ARCH),mips) MAKE_FLAGS += EXTRA_FLAGS='-buildmode=default' endif -ifeq ($(CONFIG_RUNC_SECCOMP),y) -MAKE_FLAGS += BUILDTAGS='seccomp' -else -MAKE_FLAGS += BUILDTAGS='' +BUILDTAGS:= +ifeq ($(CONFIG_KERNEL_SECCOMP_FILTER),y) +BUILDTAGS += seccomp endif +ifeq ($(CONFIG_SELINUX),y) +BUILDTAGS += selinux +endif +MAKE_FLAGS += BUILDTAGS='$(BUILDTAGS)' -define Build/Compile - $(call Build/Compile/Default) -endef - -# Avoid installing binaries -define Build/InstallDev - $(call Build/Compile/Default,clean) - rm -f $(STAMP_BUILT) - $(call GoPackage/Build/InstallDev,$(1)) -endef +# Reset golang-package.mk overrides so we can use the Makefile +Build/Compile=$(call Build/Compile/Default) define Package/runc/install $(INSTALL_DIR) $(1)/usr/sbin/