MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cni: inhibit go.mod build for main cni

Browse Source 
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>
This commit is contained in:
Bruce Ashfield 2021-06-15 08:51:23 -04:00
parent 0f59d98670
commit aa2c70a3ad
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-networking/cni/cni_git.bb
View File

@ -33,6 +33,8 @@ do_compile() {
mkdir -p ${S}/src/github.com/containernetworking mkdir -p ${S}/src/github.com/containernetworking
ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni
export GO111MODULE=off
cd ${B}/src/github.com/containernetworking/cni/libcni cd ${B}/src/github.com/containernetworking/cni/libcni
${GO} build ${GO} build
@ -45,7 +47,7 @@ do_compile() {
for p in $PLUGINS; do for p in $PLUGINS; do
plugin="$(basename "$p")" plugin="$(basename "$p")"
echo "building: $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 done
} }