From cd431b8f4498a77a800c19a857eb46717e7c71d4 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 15 Jun 2021 08:51:23 -0400 Subject: cni: inhibit go.mod build for main cni The cni plugins already have mod=vendor, but we also need to ensure that the main CNI build is not using go module based builds. To avoid inconsistent vendoring messages, we switch all plugins to no module builds as well. Signed-off-by: Bruce Ashfield --- recipes-networking/cni/cni_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index f7bead08..2e3e883c 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -33,6 +33,8 @@ do_compile() { mkdir -p ${S}/src/github.com/containernetworking ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni + export GO111MODULE=off + cd ${B}/src/github.com/containernetworking/cni/libcni ${GO} build @@ -45,7 +47,7 @@ do_compile() { for p in $PLUGINS; do plugin="$(basename "$p")" echo "building: $p" - ${GO} build -mod=vendor -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p + ${GO} build -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p done } -- cgit v1.2.3-54-g00ecf