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

cni: update to latest plugins, and skip windows bridge build

Browse Source 
Updating the cni plugins to match k8s and cri-o. We also filter out
the windows plugins, since they use a different build infrastructure
than the other variants .. and are not currently needed. This can
be revisted in the future as needed.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2018-11-01 11:30:03 -04:00
parent 2a46d2df06
commit 3724664413
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,8 +9,8 @@ Because of this focus, CNI has a wide range of support and the specification \
is simple to implement. \ is simple to implement. \
" "
SRCREV_cni = "96343561e0363c7dcc5f94bef655a8ddbb0b3e5c" SRCREV_cni = "cc562d1b44b3d00b8c341250d49a8a0823a1c085"
SRCREV_plugins = "b2fc336833674c5c42550fd2df94c1b5ca0755ba" SRCREV_plugins = "9abd20edd6c83385ff6c2a6e6ff265158059e723"
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=plugins;name=plugins \
@ -71,7 +71,7 @@ do_compile() {
go build go build
cd ${S}/src/import/vendor/github.com/containernetworking/plugins/ cd ${S}/src/import/vendor/github.com/containernetworking/plugins/
PLUGINS="plugins/meta/* plugins/main/*" PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/main/* | grep -v windows)"
mkdir -p ${WORKDIR}/plugins/bin/ mkdir -p ${WORKDIR}/plugins/bin/
for p in $PLUGINS; do for p in $PLUGINS; do
plugin="$(basename "$p")" plugin="$(basename "$p")"