Merge pull request #14886 from cotequeiroz/golang

treewide, affected packages: fix build with golang 1.16

diff --git a/net/restic-rest-server/Makefile b/net/restic-rest-server/Makefile
index 87288f20fba175424586a8e2529c1b0b533a39b1..68632bdced96adadb6bf6058bb4a9d924db27fb1 100644 (file)
--- a/net/restic-rest-server/Makefile
+++ b/net/restic-rest-server/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=restic-rest-server
 PKG_VERSION:=0.9.7
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/rest-server-$(PKG_VERSION)
 PKG_SOURCE:=rest-server-$(PKG_VERSION).tar.gz
@@ -43,6 +43,8 @@ API. It provides secure and efficient way to backup data remotely, using restic
 backup client via the rest: URL.
 endef
 
+GO_PKG_BUILD_VARS += GO111MODULE=auto
+
 define Package/restic-rest-server/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/rest-server $(1)/usr/bin/restic-rest-server

diff --git a/net/tor-fw-helper/Makefile b/net/tor-fw-helper/Makefile
index 0873ca9153d6d614906e74a862a3af2438cf2134..f0a6d438dea46af075600d9728fbee7113aa40d5 100644 (file)
--- a/net/tor-fw-helper/Makefile
+++ b/net/tor-fw-helper/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tor-fw-helper
 PKG_VERSION:=0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://git.torproject.org/tor-fw-helper.git
@@ -69,6 +69,8 @@ $(call Package/tor-fw-helper/Default/description)
 This package provides the source files for the helper program.
 endef
 
+GO_PKG_BUILD_VARS += GO111MODULE=auto
+
 $(eval $(call GoBinPackage,tor-fw-helper))
 $(eval $(call BuildPackage,tor-fw-helper))
 

diff --git a/utils/cni/Makefile b/utils/cni/Makefile
index 895c6d2aad2c3e008f5c1c3f35a71125b4b3120b..589d82793488a4b6315491efabfa0b4907b25daa 100644 (file)
--- a/utils/cni/Makefile
+++ b/utils/cni/Makefile
@@ -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

diff --git a/utils/containerd/Makefile b/utils/containerd/Makefile
index dcf348234478e031dc9e2267a1da1ea3f0f9a099..3ab6499941b1dcf61065da91baf9fd7f05c02b91 100644 (file)
--- 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)

diff --git a/utils/docker/Makefile b/utils/docker/Makefile
index 0d8af6dfd4280f2564cce136e4ca20eb7d3fc9b2..4fa3cd21a6d9b74967a0b9ae221405d6b0903a0f 100644 (file)
--- a/utils/docker/Makefile
+++ b/utils/docker/Makefile
@@ -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)
 

diff --git a/utils/dockerd/Makefile b/utils/dockerd/Makefile
index c34640a855c4d81b3ae5622cd4334760c94ea8bf..1390ae0980c930597e2ca287ced43c736c273213 100644 (file)
--- a/utils/dockerd/Makefile
+++ b/utils/dockerd/Makefile
@@ -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)
 

diff --git a/utils/libnetwork/Makefile b/utils/libnetwork/Makefile
index a3d7f3b2a1236d88b704994c2ede55f67ef85cda..cc445df1a8aa18d4c6c46618d6f23507c75fe89d 100644 (file)
--- a/utils/libnetwork/Makefile
+++ b/utils/libnetwork/Makefile
@@ -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))
 

diff --git a/utils/oci-runtime-tools/Makefile b/utils/oci-runtime-tools/Makefile
index 35d8f7f64a5bf17a6b66066ef7a1832c4cb76cdb..6621ece90a4c9102f1df3b9206101bf0a085a093 100644 (file)
--- a/utils/oci-runtime-tools/Makefile
+++ b/utils/oci-runtime-tools/Makefile
@@ -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))