summaryrefslogtreecommitdiffstats
path: root/recipes-networking/cni
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2018-07-04 12:07:09 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-07-04 12:07:09 -0400
commit1bcc2431a50df3266e7c5b11c7a6de1422fa07b2 (patch)
treea5f7141223b4b757a4725d02a7012721a09c7bd7 /recipes-networking/cni
parent0722d15fea59ed35bb35735a02353caa53e37d4b (diff)
downloadmeta-virtualization-1bcc2431a50df3266e7c5b11c7a6de1422fa07b2.tar.gz
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 <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking/cni')
-rw-r--r--recipes-networking/cni/cni_git.bb7
1 files changed, 5 insertions, 2 deletions
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 \
9is simple to implement. \ 9is simple to implement. \
10" 10"
11 11
12SRCREV_cni = "4b9e11a5266fe50222ed00c5973c6ea4a384a4bb" 12SRCREV_cni = "96343561e0363c7dcc5f94bef655a8ddbb0b3e5c"
13SRCREV_plugins = "c238c93b5e7c681f1935ff813b30e82f96f6c367" 13SRCREV_plugins = "b2fc336833674c5c42550fd2df94c1b5ca0755ba"
14SRC_URI = "\ 14SRC_URI = "\
15 git://github.com/containernetworking/cni.git;nobranch=1;name=cni \ 15 git://github.com/containernetworking/cni.git;nobranch=1;name=cni \
16 git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=plugins;name=plugins \ 16 git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=plugins;name=plugins \
@@ -43,6 +43,7 @@ do_compile() {
43 43
44 # link fixups for compilation 44 # link fixups for compilation
45 rm -f ${S}/src/import/vendor/src 45 rm -f ${S}/src/import/vendor/src
46 mkdir -p ${S}/src/import/vendor/
46 ln -sf ./ ${S}/src/import/vendor/src 47 ln -sf ./ ${S}/src/import/vendor/src
47 rm -rf ${S}/src/import/plugins 48 rm -rf ${S}/src/import/plugins
48 rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins 49 rm -rf ${S}/src/import/vendor/github.com/containernetworking/plugins
@@ -93,3 +94,5 @@ FILES_${PN} += "/opt/cni/bin/*"
93 94
94INHIBIT_PACKAGE_STRIP = "1" 95INHIBIT_PACKAGE_STRIP = "1"
95INSANE_SKIP_${PN} += "ldflags already-stripped" 96INSANE_SKIP_${PN} += "ldflags already-stripped"
97
98deltask compile_ptest_base