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: update to the latest plugins

Browse Source 
Updating the latest plugins.

We have to make some minor build adjustments, but otherwise, this is
a simple update.

We also drop the ptest build, since it is not used and is causing
build errors.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Bruce Ashfield 2018-07-04 12:07:09 -04:00
parent 0722d15fea
commit 1bcc2431a5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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 = "4b9e11a5266fe50222ed00c5973c6ea4a384a4bb" SRCREV_cni = "96343561e0363c7dcc5f94bef655a8ddbb0b3e5c"
SRCREV_plugins = "c238c93b5e7c681f1935ff813b30e82f96f6c367" SRCREV_plugins = "b2fc336833674c5c42550fd2df94c1b5ca0755ba"
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 \
@ -43,6 +43,7 @@ do_compile() {
# link fixups for compilation # link fixups for compilation
rm -f ${S}/src/import/vendor/src rm -f ${S}/src/import/vendor/src
mkdir -p ${S}/src/import/vendor/
ln -sf ./ ${S}/src/import/vendor/src ln -sf ./ ${S}/src/import/vendor/src
rm -rf ${S}/src/import/plugins rm -rf ${S}/src/import/plugins
rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins
@ -93,3 +94,5 @@ FILES_${PN} += "/opt/cni/bin/*"
INHIBIT_PACKAGE_STRIP = "1" INHIBIT_PACKAGE_STRIP = "1"
INSANE_SKIP_${PN} += "ldflags already-stripped" INSANE_SKIP_${PN} += "ldflags already-stripped"
deltask compile_ptest_base