From 1bcc2431a50df3266e7c5b11c7a6de1422fa07b2 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 4 Jul 2018 12:07:09 -0400 Subject: cni: update to the latest plugins 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 --- recipes-networking/cni/cni_git.bb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'recipes-networking/cni') diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 427a812f..b9708480 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -9,8 +9,8 @@ Because of this focus, CNI has a wide range of support and the specification \ is simple to implement. \ " -SRCREV_cni = "4b9e11a5266fe50222ed00c5973c6ea4a384a4bb" -SRCREV_plugins = "c238c93b5e7c681f1935ff813b30e82f96f6c367" +SRCREV_cni = "96343561e0363c7dcc5f94bef655a8ddbb0b3e5c" +SRCREV_plugins = "b2fc336833674c5c42550fd2df94c1b5ca0755ba" SRC_URI = "\ git://github.com/containernetworking/cni.git;nobranch=1;name=cni \ git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=plugins;name=plugins \ @@ -43,6 +43,7 @@ do_compile() { # link fixups for compilation rm -f ${S}/src/import/vendor/src + 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 @@ -93,3 +94,5 @@ FILES_${PN} += "/opt/cni/bin/*" INHIBIT_PACKAGE_STRIP = "1" INSANE_SKIP_${PN} += "ldflags already-stripped" + +deltask compile_ptest_base -- cgit v1.2.3-54-g00ecf