cni: adapt SRC_URI to include destsuffix=${GO_SRCURI_DESTSUFFIX}

As of commit cc4ec43a2b657fb4c58429ab14f1edc2473c1327 [go: Drop fork
of unpack code, mandate GO_SRCURI_DESTSUFFIX] we require this
variable in our go recipes.

We also must adjust to UNPACKDIR changes which requires rework
of the directories for the clones and source layout.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 16 insertions, 6 deletions

diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index b41b47cf..aa9902e3 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -14,12 +14,13 @@ SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c"
 SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0"
 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
@@ -32,6 +33,7 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
 GO_IMPORT = "import"
+S = "${WORKDIR}/git"
 
 PV = "v1.2.0-rc0+git${SRCREV_cni}"
 CNI_VERSION = "v1.2.0"
@@ -49,11 +51,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 +73,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