1 files changed, 28 insertions, 13 deletions

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index b41b47cf..4714e751 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -9,17 +9,18 @@ Because of this focus, CNI has a wide range of support and the specification \
 is simple to implement. \
 "
 
-SRCREV_cni = "b62753aa2bfa365c1ceaff6f25774a8047c896b5"
-SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c"
-SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0"
+SRCREV_cni = "4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca"
+SRCREV_plugins = "35831f3d23956658aaa3109cbae0ce24d28137e6"
+SRCREV_flannel_plugin = "cc21427ce5b2c606ba5ececa0a488452e80d73f8"
 SRCREV_FORMAT = "cni_plugins"
 SRC_URI = "\
-        git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https \
-        git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \
-        git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel \
-        file://modules.txt \
+        git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
+        file://modules.txt \
         "
 
+SRC_URI += "git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${GO_SRCURI_DESTSUFFIX}/src/github.com/containernetworking/plugins;name=plugins;protocol=https"
+SRC_URI += "git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}/src/github.com/containernetworking/plugins/plugins/meta/flannel"
+
 # generated via:
 # ./scripts/oe-go-mod-autogen.py --repo https://github.com/containernetworking/cni.git --rev <insert your rev here>
 include src_uri.inc
@@ -33,8 +34,8 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464
 
 GO_IMPORT = "import"
 
-PV = "v1.2.0-rc0+git${SRCREV_cni}"
-CNI_VERSION = "v1.2.0"
+PV = "v1.2.3+git"
+CNI_VERSION = "v1.2.3"
 
 inherit go
 inherit goarch
@@ -49,11 +50,19 @@ do_compile() {
         mkdir -p ${S}/src/github.com/containernetworking
         ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni
 
+        # Fixes: cannot find package "github.com/containernetworking/plugins/plugins/meta/bandwidth" in any of:
+        # we can't clone the plugin source directly to where it belongs because
+        # there seems to be an issue in the relocation code from UNPACKDIR to S
+        # and our LICENSE file is never found.
+        # This symbolic link arranges for the code to be available where go will
+        # search during the build
+        ln -sfr ${S}/src/import/src/github.com/containernetworking/plugins ${B}/src/github.com/containernetworking
+
         # our copied .go files are to be used for the build
         ln -sf vendor.copy vendor
 
         # inform go that we know what we are doing
-        cp ${WORKDIR}/modules.txt vendor/
+        cp ${UNPACKDIR}/modules.txt vendor/
 
         export GO111MODULE=off
 
@@ -63,7 +72,7 @@ do_compile() {
         cd ${B}/src/github.com/containernetworking/cni/cnitool
         ${GO} build ${GOBUILDFLAGS}
 
-        cd ${B}/src/github.com/containernetworking/plugins
+        cd ${B}/src/import/src/github.com/containernetworking/plugins
         PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)"
         mkdir -p ${B}/plugins/bin/
         for p in $PLUGINS; do
@@ -84,15 +93,21 @@ do_install() {
     install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir}
     install -m 755 -D ${B}/plugins/bin/* ${D}/${localbindir}
 
+    # make cnitool more available on the path
+    install -d ${D}${bindir}
+    ln -sr ${D}/${localbindir}/cnitool ${D}/${bindir}
+
     # Parts of k8s expect the cni binaries to be available in /opt/cni
     install -d ${D}/opt/cni
     ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin
 }
 
+PACKAGECONFIG ?= "ca-certs"
+PACKAGECONFIG[ca-certs] = ",,,ca-certificates"
+
 FILES:${PN} += "${libexecdir}/cni/* /opt/cni/bin"
 
 INSANE_SKIP:${PN} += "ldflags already-stripped"
 
 deltask compile_ptest_base
-
-RDEPENDS:${PN} += " ca-certificates"
+RRECOMMENDS:${PN} += "iptables iproute2"