MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-05 13:25:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cni: prevent go from downloading stuff in the background

Browse Source 
While testing the cni uprev by building in a container with
network=none the following error was found:

  go: github.com/Microsoft/go-winio@v0.4.11: Get
   https://proxy.golang.org/github.com/%21microsoft/go-winio/@v/v0.4.11.mod:
   dial tcp: lookup proxy.golang.org on 128.224.144.130:53:
   dial udp 128.224.144.130:53: connect: network is unreachable

After some digging through the go documentation it was found that the
'-mod=vendor' is required for 'go build' to use shipped vendor modules
when building modules. This can be confirmed by look at the
'build_linux.sh' script which is found in the plugins repo.

By using '-mod=vendor' and also ensuring things are properly placed in
the GOPATH (ie $B) we can avoid having to create many of the links we
had been previously.

We also put all the build artifacts into $B to avoid mixing source and
build.

Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Mark Asselstine 2020-03-06 16:53:42 -05:00 committed by Bruce Ashfield
parent e65c3761e0
commit de94eb1572
1 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ SRCREV_cni = "4cfb7b568922a3c79a23e438dc52fe537fc9687e"
SRCREV_plugins = "1f33fb729ae2b8900785f896df2dc1f6fe5e8239" SRCREV_plugins = "1f33fb729ae2b8900785f896df2dc1f6fe5e8239"
SRC_URI = "\ SRC_URI = "\
git://github.com/containernetworking/cni.git;nobranch=1;name=cni \ git://github.com/containernetworking/cni.git;nobranch=1;name=cni \
git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=plugins;name=plugins \ git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \
" "
RPROVIDES_${PN} += "kubernetes-cni" RPROVIDES_${PN} += "kubernetes-cni"
@ -30,36 +30,22 @@ inherit go
inherit goarch inherit goarch
do_compile() { do_compile() {
# link fixups for compilation mkdir -p ${S}/src/github.com/containernetworking
rm -f ${S}/src/import/vendor/src ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni
mkdir -p ${S}/src/import/vendor/
ln -sf ./ ${S}/src/import/vendor/src
rm -rf ${S}/src/import/plugins
rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins
mkdir -p ${S}/src/import/vendor/github.com/containernetworking/cni cd ${B}/src/github.com/containernetworking/cni/libcni
ln -sf ../../../../libcni ${S}/src/import/vendor/github.com/containernetworking/cni/libcni
ln -sf ../../../../pkg ${S}/src/import/vendor/github.com/containernetworking/cni/pkg
ln -sf ../../../../cnitool ${S}/src/import/vendor/github.com/containernetworking/cni/cnitool
ln -sf ${WORKDIR}/plugins ${S}/src/import/vendor/github.com/containernetworking/plugins
export GOPATH="${S}/src/import/.gopath:${S}/src/import/vendor:${STAGING_DIR_TARGET}/${prefix}/local/go"
export CGO_ENABLED="1"
cd ${S}/src/import/vendor/github.com/containernetworking/cni/libcni
${GO} build ${GO} build
cd ${S}/src/import/vendor/github.com/containernetworking/cni/cnitool cd ${B}/src/github.com/containernetworking/cni/cnitool
${GO} build ${GO} build
cd ${S}/src/import/vendor/github.com/containernetworking/plugins/ cd ${B}/src/github.com/containernetworking/plugins
PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)"
mkdir -p ${WORKDIR}/plugins/bin/ mkdir -p ${B}/plugins/bin/
for p in $PLUGINS; do for p in $PLUGINS; do
plugin="$(basename "$p")" plugin="$(basename "$p")"
echo "building: $p" echo "building: $p"
${GO} build -o ${WORKDIR}/plugins/bin/$plugin github.com/containernetworking/plugins/$p ${GO} build -mod=vendor -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
done done
} }
@ -70,7 +56,7 @@ do_install() {
install -d ${D}/${sysconfdir}/cni/net.d install -d ${D}/${sysconfdir}/cni/net.d
install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir}
install -m 755 -D ${WORKDIR}/plugins/bin/* ${D}/${localbindir} install -m 755 -D ${B}/plugins/bin/* ${D}/${localbindir}
# Parts of k8s expect the cni binaries to be available in /opt/cni # Parts of k8s expect the cni binaries to be available in /opt/cni
install -d ${D}/opt/cni install -d ${D}/opt/cni