Merge pull request #14886 from cotequeiroz/golang

treewide, affected packages: fix build with golang 1.16
This commit is contained in:
Rosen Penev
2021-02-24 16:54:34 -08:00
committed by GitHub
8 changed files with 20 additions and 8 deletions
+2 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=cni
PKG_VERSION:=0.8.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@@ -23,6 +23,7 @@ include $(INCLUDE_DIR)/package.mk
include ../../lang/golang/golang-package.mk
PKG_USE_MIPS16:=0
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Package/cni
SECTION:=utils
+2 -1
View File
@@ -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 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=docker
PKG_VERSION:=20.10.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@@ -34,6 +34,7 @@ define Package/docker/description
The CLI used in the Docker CE and Docker EE products.
endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+2 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=dockerd
PKG_VERSION:=20.10.2
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@@ -46,6 +46,7 @@ define Package/dockerd/description
The Docker CE Engine.
endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
TAR_OPTIONS:=--strip-components 1 $(TAR_OPTIONS)
TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS)
+3 -1
View File
@@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libnetwork
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@@ -38,6 +38,8 @@ Libnetwork provides a native Go implementation for connecting containers.
The goal of libnetwork is to deliver a robust Container Network Model that provides a consistent programming interface and the required network abstractions for applications.
endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Package/libnetwork/install
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+3 -1
View File
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=oci-runtime-tools
PKG_VERSION:=1.0.0-pre20210122
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=Apache-2.0
PKG_LICENSE_FILES:=LICENSE
@@ -54,6 +54,8 @@ define Package/oci-runtime-tests/description
installable via npm.
endef
GO_PKG_BUILD_VARS += GO111MODULE=auto
define Build/Compile
$(call GoPackage/Build/Compile)
$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))