From: Eneas U de Queiroz <cotequeiroz@gmail.com>
Date: Wed, 24 Feb 2021 18:37:59 +0000 (-0300)
Subject: cni: fix build with golang 1.16
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=aa382aad96b3964ea3e58a89125a6d477b07d273;p=feed%2Fpackages.git

cni: 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 <cotequeiroz@gmail.com>
(cherry picked from commit 619270da0e3b81af08cb2924c8484e92b22339de)
---

diff --git a/utils/cni/Makefile b/utils/cni/Makefile
index 895c6d2aad..589d827934 100644
--- 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