summaryrefslogtreecommitdiffstats
path: root/recipes-networking/cni
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-06-15 08:51:23 -0400
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-06-15 10:33:41 -0400
commitaa2c70a3ad83469a57e447f08e31d0ab785244e8 (patch)
tree11e4292afcc489f4bde48d8345d0f6bed048d22b /recipes-networking/cni
parent0f59d9867020538f416d18fe2dafffa0b00be06a (diff)
downloadmeta-virtualization-aa2c70a3ad83469a57e447f08e31d0ab785244e8.tar.gz
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 <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-networking/cni')
-rw-r--r--recipes-networking/cni/cni_git.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 161b98b0..ece5142c 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -33,6 +33,8 @@ do_compile() {
33 mkdir -p ${S}/src/github.com/containernetworking 33 mkdir -p ${S}/src/github.com/containernetworking
34 ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni 34 ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni
35 35
36 export GO111MODULE=off
37
36 cd ${B}/src/github.com/containernetworking/cni/libcni 38 cd ${B}/src/github.com/containernetworking/cni/libcni
37 ${GO} build 39 ${GO} build
38 40
@@ -45,7 +47,7 @@ do_compile() {
45 for p in $PLUGINS; do 47 for p in $PLUGINS; do
46 plugin="$(basename "$p")" 48 plugin="$(basename "$p")"
47 echo "building: $p" 49 echo "building: $p"
48 ${GO} build -mod=vendor -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p 50 ${GO} build -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
49 done 51 done
50} 52}
51 53