summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2025-12-06 18:51:41 +0000
committerBruce Ashfield <bruce.ashfield@gmail.com>2025-12-08 20:57:44 -0500
commit6c71c81ea53378b23353ce69562d41f52fc71263 (patch)
tree394d79798bf0e0f61e66641330db9e344e31233f
parent233ad1457f8ae98d558e16b21fba676cef17feb3 (diff)
downloadmeta-virtualization-6c71c81ea53378b23353ce69562d41f52fc71263.tar.gz
cni: update to go-mod-vcs format
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat
-rw-r--r--recipes-networking/cni/cni_git.bb60
-rw-r--r--recipes-networking/cni/go-mod-cache.inc38
-rw-r--r--recipes-networking/cni/go-mod-git.inc54
-rw-r--r--recipes-networking/cni/relocation.inc30
-rw-r--r--recipes-networking/cni/src_uri.inc65
5 files changed, 135 insertions, 112 deletions
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb
index 4714e751..5e270df4 100644
--- a/recipes-networking/cni/cni_git.bb
+++ b/recipes-networking/cni/cni_git.bb
@@ -15,15 +15,13 @@ SRCREV_flannel_plugin = "cc21427ce5b2c606ba5ececa0a488452e80d73f8"
15SRCREV_FORMAT = "cni_plugins" 15SRCREV_FORMAT = "cni_plugins"
16SRC_URI = "\ 16SRC_URI = "\
17 git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ 17 git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \
18 file://modules.txt \
19 " 18 "
20 19
21SRC_URI += "git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${GO_SRCURI_DESTSUFFIX}/src/github.com/containernetworking/plugins;name=plugins;protocol=https" 20SRC_URI += "git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${GO_SRCURI_DESTSUFFIX}/src/github.com/containernetworking/plugins;name=plugins;protocol=https"
22SRC_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" 21SRC_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"
23 22
24# generated via: 23include go-mod-git.inc
25# ./scripts/oe-go-mod-autogen.py --repo https://github.com/containernetworking/cni.git --rev <insert your rev here> 24include go-mod-cache.inc
26include src_uri.inc
27 25
28DEPENDS = " \ 26DEPENDS = " \
29 rsync-native \ 27 rsync-native \
@@ -37,15 +35,24 @@ GO_IMPORT = "import"
37PV = "v1.2.3+git" 35PV = "v1.2.3+git"
38CNI_VERSION = "v1.2.3" 36CNI_VERSION = "v1.2.3"
39 37
38# go-mod-discovery configuration
39# The CNI repo has minimal dependencies. The plugins repo is a separate module
40# with its own dependencies, so we need to discover both.
41# Primary discovery is for the CNI main repo:
42GO_MOD_DISCOVERY_BUILD_TARGET = "./..."
43GO_MOD_DISCOVERY_GIT_REPO = "https://github.com/containernetworking/cni.git"
44GO_MOD_DISCOVERY_GIT_REF = "${SRCREV_cni}"
45
46# Secondary discovery for the plugins repo - we'll run this manually and merge
47# For now, the plugins repo uses its vendor directory
48
40inherit go 49inherit go
41inherit goarch 50inherit goarch
51inherit go-mod-discovery
42 52
43# https://github.com/llvm/llvm-project/issues/53999 53# https://github.com/llvm/llvm-project/issues/53999
44TOOLCHAIN = "gcc" 54TOOLCHAIN = "gcc"
45 55
46# sets the "sites" variable.
47include relocation.inc
48
49do_compile() { 56do_compile() {
50 mkdir -p ${S}/src/github.com/containernetworking 57 mkdir -p ${S}/src/github.com/containernetworking
51 ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni 58 ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni
@@ -58,28 +65,47 @@ do_compile() {
58 # search during the build 65 # search during the build
59 ln -sfr ${S}/src/import/src/github.com/containernetworking/plugins ${B}/src/github.com/containernetworking 66 ln -sfr ${S}/src/import/src/github.com/containernetworking/plugins ${B}/src/github.com/containernetworking
60 67
61 # our copied .go files are to be used for the build 68 cd ${B}/src/import
62 ln -sf vendor.copy vendor
63 69
64 # inform go that we know what we are doing 70 export GOPATH="${S}/src/import/.gopath:${STAGING_DIR_TARGET}/${prefix}/local/go"
65 cp ${UNPACKDIR}/modules.txt vendor/ 71 export GOMODCACHE="${S}/pkg/mod"
66 72 export CGO_ENABLED="1"
67 export GO111MODULE=off 73 export GOSUMDB="off"
74 export GOTOOLCHAIN="local"
75 export GOPROXY="off"
68 76
69 cd ${B}/src/github.com/containernetworking/cni/libcni 77 cd ${B}/src/github.com/containernetworking/cni/libcni
70 ${GO} build ${GOBUILDFLAGS} 78 ${GO} build -trimpath ${GOBUILDFLAGS}
71 79
72 cd ${B}/src/github.com/containernetworking/cni/cnitool 80 cd ${B}/src/github.com/containernetworking/cni/cnitool
73 ${GO} build ${GOBUILDFLAGS} 81 ${GO} build -trimpath ${GOBUILDFLAGS}
74 82
75 cd ${B}/src/import/src/github.com/containernetworking/plugins 83 cd ${B}/src/import/src/github.com/containernetworking/plugins
76 PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" 84
85 # Build plugins from the plugins repo (excludes flannel which is a separate module)
86 # Exclude flannel from this loop - it's from a different repo with a different module path
87 PLUGINS="$(ls -d plugins/meta/* | grep -v flannel; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)"
77 mkdir -p ${B}/plugins/bin/ 88 mkdir -p ${B}/plugins/bin/
78 for p in $PLUGINS; do 89 for p in $PLUGINS; do
79 plugin="$(basename "$p")" 90 plugin="$(basename "$p")"
80 echo "building: $p" 91 echo "building: $p"
81 ${GO} build ${GOBUILDFLAGS} -ldflags '-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${CNI_VERSION}' -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p 92 ${GO} build -trimpath ${GOBUILDFLAGS} -ldflags '-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${CNI_VERSION}' -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p
82 done 93 done
94
95 # Build flannel separately - it's from flannel-io/cni-plugin repo with its own module
96 # The source was fetched to plugins/meta/flannel but module path is github.com/flannel-io/cni-plugin
97 echo "building: flannel (from flannel-io/cni-plugin)"
98 cd ${B}/src/import/src/github.com/containernetworking/plugins/plugins/meta/flannel
99
100 # Flannel has its own go.mod/go.sum but its dependencies (containernetworking/cni
101 # and containernetworking/plugins) are already available in the plugins vendor directory.
102 # Remove go.mod/go.sum so Go treats this as a plain package within the plugins module
103 # and uses the vendor directory for dependencies.
104 rm -f go.mod go.sum
105
106 # Build from the plugins directory context so -mod=vendor finds deps in plugins/vendor
107 cd ${B}/src/import/src/github.com/containernetworking/plugins
108 ${GO} build -trimpath ${GOBUILDFLAGS} -o ${B}/plugins/bin/flannel ./plugins/meta/flannel
83} 109}
84 110
85do_compile[cleandirs] = "${B}/plugins" 111do_compile[cleandirs] = "${B}/plugins"
diff --git a/recipes-networking/cni/go-mod-cache.inc b/recipes-networking/cni/go-mod-cache.inc
new file mode 100644
index 00000000..52948f26
--- /dev/null
+++ b/recipes-networking/cni/go-mod-cache.inc
@@ -0,0 +1,38 @@
1# Generated by oe-go-mod-fetcher.py v3.0.0
2# Module cache data for Go dependencies
3#
4# This file contains recipe-specific module metadata.
5# The task implementations are in go-mod-vcs.bbclass.
6
7inherit go-mod-vcs
8
9# Module metadata for cache building (one module per line)
10GO_MODULE_CACHE_DATA = '[\
11{"module":"github.com/vishvananda/netns","version":"v0.0.4","vcs_hash":"d15818789eb7bb00d665000b7884b01ceb67b9b437a04c9ecca082ba51e1565e","timestamp":"2023-01-23T18:27:00Z","subdir":"","vcs_ref":"refs/tags/v0.0.4"},\
12{"module":"github.com/google/go-cmp","version":"v0.6.0","vcs_hash":"066c8baed8b5c49c8bf75e59b5e0a559593a7098e3e99236e4fc5b6e29e3ac91","timestamp":"2023-08-31T17:32:40Z","subdir":"","vcs_ref":"refs/tags/v0.6.0"},\
13{"module":"github.com/google/pprof","version":"v0.0.0-20240727154555-813a5fbdbec8","vcs_hash":"01740331f170dffba2f38808727de567826c30b68d9ad7abb0f5ca900ca5a3ba","timestamp":"2024-07-27T15:45:55Z","subdir":"","vcs_ref":""},\
14{"module":"github.com/chzyer/readline","version":"v1.5.1","vcs_hash":"52071e641b114be49adcba007fd97faf1f4baeb21b57b3920f7baba279eb71fa","timestamp":"2022-07-15T12:48:48Z","subdir":"","vcs_ref":"refs/tags/v1.5.1"},\
15{"module":"github.com/yuin/goldmark","version":"v1.4.13","vcs_hash":"fbec1a06cf7d810b36a87559756866f825159c4db030b543bd6359717d401035","timestamp":"2022-07-09T07:22:17Z","subdir":"","vcs_ref":"refs/tags/v1.4.13"},\
16{"module":"github.com/go-logr/logr","version":"v1.4.2","vcs_hash":"9655eab28e005d39cc2bb4b149948f2765b6737fb833acda1ea9a8fa1c01f086","timestamp":"2024-05-20T10:45:40Z","subdir":"","vcs_ref":"refs/tags/v1.4.2"},\
17{"module":"github.com/ianlancetaylor/demangle","version":"v0.0.0-20240312041847-bd984b5ce465","vcs_hash":"190d0769fcb0583bb638d524115b887c6d000e04c6d64f1488a06b55bf5eac4c","timestamp":"2024-03-12T04:18:47Z","subdir":"","vcs_ref":""},\
18{"module":"github.com/go-task/slim-sprig/v3","version":"v3.0.0","vcs_hash":"8dd5020cf322cc4f91014ac7828ac4826cba4ce7da08320ac497d655159088a5","timestamp":"2023-09-14T01:46:41Z","subdir":"","vcs_ref":"refs/tags/v3.0.0"},\
19{"module":"github.com/containernetworking/cni","version":"v1.2.4-0.20240829080103-4c9ae43c0eaa","vcs_hash":"dfc8140cf68d46792c81038b0574be7d82808f552267e38eb21e351f504c653c","timestamp":"2024-08-29T08:01:03Z","subdir":"","vcs_ref":""},\
20{"module":"github.com/pmezard/go-difflib","version":"v1.0.0","vcs_hash":"c04ad296d2e3203fda8b7ca96feaca21b20b3b7441e33c7d67cda029ea61ab4c","timestamp":"2016-01-10T10:55:54Z","subdir":"","vcs_ref":"refs/tags/v1.0.0"},\
21{"module":"github.com/davecgh/go-spew","version":"v1.1.1","vcs_hash":"4c7d69cfe586f86079773ff48d94f76d327c2914d8dfeffca9e34fd1146e5d5e","timestamp":"2018-02-21T23:26:28Z","subdir":"","vcs_ref":"refs/tags/v1.1.1"},\
22{"module":"github.com/onsi/gomega","version":"v1.34.1","vcs_hash":"5d804844b09e94f5ebe51951fab8e7b49bdb61690fc0ffa035a4b0d39839fab2","timestamp":"2024-07-29T18:29:33Z","subdir":"","vcs_ref":"refs/tags/v1.34.1"},\
23{"module":"github.com/onsi/ginkgo/v2","version":"v2.20.1","vcs_hash":"250c6ed89fc0be4bae692e1c5f1f1e6828774d5a023a2a0844246ec3f2b52c01","timestamp":"2024-08-21T18:37:22Z","subdir":"","vcs_ref":"refs/tags/v2.20.1"},\
24{"module":"github.com/stretchr/testify","version":"v1.8.4","vcs_hash":"cec0eadb3ceb93408aae446eb0c115ea4a39cd4ba2048947ee55e1f8969c3872","timestamp":"2023-05-30T09:38:40Z","subdir":"","vcs_ref":"refs/tags/v1.8.4"},\
25{"module":"golang.org/x/sys","version":"v0.23.0","vcs_hash":"ab1c9d8044ec55ff95f7d385c76150aeabf000c2a14bc1775a1766dd90f14cda","timestamp":"2024-08-03T07:06:10Z","subdir":"","vcs_ref":"refs/tags/v0.23.0"},\
26{"module":"golang.org/x/mod","version":"v0.20.0","vcs_hash":"c837184171f2b9a408933cc7892b7ef003ef72a2d18747dc23c77f54fa57d62b","timestamp":"2024-07-30T14:22:55Z","subdir":"","vcs_ref":"refs/tags/v0.20.0"},\
27{"module":"golang.org/x/term","version":"v0.23.0","vcs_hash":"5c601017bf1fc28cce196476ddd88d281c6d676e09ca5cb41e9b848278953afd","timestamp":"2024-08-06T15:15:04Z","subdir":"","vcs_ref":"refs/tags/v0.23.0"},\
28{"module":"golang.org/x/sync","version":"v0.8.0","vcs_hash":"552bab19670b2a96ac65b9bf6d179b6bbbdd4321531f3f9b5a1e39585df8bd69","timestamp":"2024-07-16T16:06:58Z","subdir":"","vcs_ref":"refs/tags/v0.8.0"},\
29{"module":"golang.org/x/crypto","version":"v0.26.0","vcs_hash":"9fee15430a30cbeeac8229c4916bcd1f80913f48cebc1cc27ef6700c18a12e7c","timestamp":"2024-08-06T15:38:17Z","subdir":"","vcs_ref":"refs/tags/v0.26.0"},\
30{"module":"golang.org/x/net","version":"v0.28.0","vcs_hash":"caa479eb7dcd0818480849128d1c9b837bb91b666f0a69c3c660088c81936b8a","timestamp":"2024-08-06T17:39:36Z","subdir":"","vcs_ref":"refs/tags/v0.28.0"},\
31{"module":"golang.org/x/exp","version":"v0.0.0-20240719175910-8a7402abbf56","vcs_hash":"3575b051814aade4d8d39c1eaad80043b24b44f1c94ac279ffa894655e6e9268","timestamp":"2024-07-19T17:59:10Z","subdir":"","vcs_ref":""},\
32{"module":"golang.org/x/text","version":"v0.17.0","vcs_hash":"b2ed225adb707701e8acdb5ca1f97b68330d6b62805bc3b9f9f3473e33d22e39","timestamp":"2024-08-06T15:16:44Z","subdir":"","vcs_ref":"refs/tags/v0.17.0"},\
33{"module":"golang.org/x/telemetry","version":"v0.0.0-20240521205824-bda55230c457","vcs_hash":"55f64daa6b07d1422edbea2ff80ef3c3307bd4fcf3117421ebc3cbcbb7f53bb8","timestamp":"2024-05-21T20:58:24Z","subdir":"","vcs_ref":""},\
34{"module":"golang.org/x/tools","version":"v0.24.0","vcs_hash":"0058433bc8aa3748f0d426a99cbdb335695657415da7a591cde9c2fddf000c22","timestamp":"2024-08-06T19:12:18Z","subdir":"","vcs_ref":"refs/tags/v0.24.0"},\
35{"module":"gopkg.in/check.v1","version":"v0.0.0-20161208181325-20d25e280405","vcs_hash":"f6f7125ac7ef086ca6395a14a9a28c8c11cd6f8790a8be7cfd6475d1acd0f40b","timestamp":"2016-12-08T18:13:25Z","subdir":"","vcs_ref":""},\
36{"module":"gopkg.in/yaml.v3","version":"v3.0.1","vcs_hash":"8d340fff421a1861f196061b40e49b2f9e802647204935d08e1062b8ecd90b0d","timestamp":"2022-05-27T08:35:30Z","subdir":"","vcs_ref":"refs/tags/v3.0.1"},\
37{"module":"google.golang.org/protobuf","version":"v1.34.1","vcs_hash":"51aac33eb358c68e9ab8f290448d701d1f8d29bca52a65bfb8dda6c98a57eb7d","timestamp":"2024-05-06T12:17:40Z","subdir":"","vcs_ref":"refs/tags/v1.34.1"}\
38]'
diff --git a/recipes-networking/cni/go-mod-git.inc b/recipes-networking/cni/go-mod-git.inc
new file mode 100644
index 00000000..c5316588
--- /dev/null
+++ b/recipes-networking/cni/go-mod-git.inc
@@ -0,0 +1,54 @@
1# Generated by oe-go-mod-fetcher.py v3.0.0
2# Git repositories for Go module dependencies
3
4SRC_URI += "git://github.com/vishvananda/netns;protocol=https;nobranch=1;shallow=1;rev=7a452d2d15292b2bfb2a2d88e6bdeac156a761b9;name=git_e786acee_0;destsuffix=vcs_cache/d15818789eb7bb00d665000b7884b01ceb67b9b437a04c9ecca082ba51e1565e"
5SRC_URI += "git://github.com/google/go-cmp;protocol=https;nobranch=1;shallow=1;rev=c3ad8435e7bef96af35732bc0789e5a2278c6d5f;name=git_8726c33a_0;destsuffix=vcs_cache/066c8baed8b5c49c8bf75e59b5e0a559593a7098e3e99236e4fc5b6e29e3ac91"
6SRC_URI += "git://github.com/google/pprof;protocol=https;branch=main;rev=813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac;name=git_4d435d14_0;destsuffix=vcs_cache/01740331f170dffba2f38808727de567826c30b68d9ad7abb0f5ca900ca5a3ba"
7SRC_URI += "git://github.com/chzyer/readline;protocol=https;nobranch=1;rev=7f93d88cd5ffa0e805d58d2f9fc3191be15ec668;name=git_2b1d73c0_0;destsuffix=vcs_cache/52071e641b114be49adcba007fd97faf1f4baeb21b57b3920f7baba279eb71fa"
8SRC_URI += "git://github.com/yuin/goldmark;protocol=https;nobranch=1;shallow=1;rev=c0856327b39b00b39b5d7e1f5ed0eed8bb1b6a23;name=git_40d8a3db_0;destsuffix=vcs_cache/fbec1a06cf7d810b36a87559756866f825159c4db030b543bd6359717d401035"
9SRC_URI += "git://github.com/go-logr/logr;protocol=https;nobranch=1;shallow=1;rev=1205f429d540b8b81c2b75a38943afb738dac223;name=git_e0ff909e_0;destsuffix=vcs_cache/9655eab28e005d39cc2bb4b149948f2765b6737fb833acda1ea9a8fa1c01f086"
10SRC_URI += "git://github.com/ianlancetaylor/demangle;protocol=https;branch=master;rev=bd984b5ce465cae93d894caa85838021209b9a57;name=git_92f2e92b_0;destsuffix=vcs_cache/190d0769fcb0583bb638d524115b887c6d000e04c6d64f1488a06b55bf5eac4c"
11SRC_URI += "git://github.com/go-task/slim-sprig;protocol=https;nobranch=1;rev=b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894;name=git_0442e1d1_0;destsuffix=vcs_cache/8dd5020cf322cc4f91014ac7828ac4826cba4ce7da08320ac497d655159088a5"
12SRC_URI += "git://github.com/containernetworking/cni;protocol=https;branch=main;rev=4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca;name=git_4ce5ee0d_0;destsuffix=vcs_cache/dfc8140cf68d46792c81038b0574be7d82808f552267e38eb21e351f504c653c"
13SRC_URI += "git://github.com/pmezard/go-difflib;protocol=https;nobranch=1;rev=792786c7400a136282c1664665ae0a8db921c6c2;name=git_b66720d7_0;destsuffix=vcs_cache/c04ad296d2e3203fda8b7ca96feaca21b20b3b7441e33c7d67cda029ea61ab4c"
14SRC_URI += "git://github.com/davecgh/go-spew;protocol=https;nobranch=1;rev=8991bc29aa16c548c550c7ff78260e27b9ab7c73;name=git_d9a489aa_0;destsuffix=vcs_cache/4c7d69cfe586f86079773ff48d94f76d327c2914d8dfeffca9e34fd1146e5d5e"
15SRC_URI += "git://github.com/onsi/gomega;protocol=https;nobranch=1;shallow=1;rev=fa057b845528c9336265d6df77e21d827f268c7d;name=git_4f2954a0_0;destsuffix=vcs_cache/5d804844b09e94f5ebe51951fab8e7b49bdb61690fc0ffa035a4b0d39839fab2"
16SRC_URI += "git://github.com/onsi/ginkgo;protocol=https;nobranch=1;shallow=1;rev=4ef0afb9f28f241c352cad6ca9dae8b149e57bc4;name=git_209602b3_0;destsuffix=vcs_cache/250c6ed89fc0be4bae692e1c5f1f1e6828774d5a023a2a0844246ec3f2b52c01"
17SRC_URI += "git://github.com/stretchr/testify;protocol=https;nobranch=1;shallow=1;rev=f97607b89807936ac4ff96748d766cf4b9711f78;name=git_aa93f7ee_0;destsuffix=vcs_cache/cec0eadb3ceb93408aae446eb0c115ea4a39cd4ba2048947ee55e1f8969c3872"
18SRC_URI += "git://go.googlesource.com/sys;protocol=https;nobranch=1;shallow=1;rev=aa1c4c8554e2f3f54247c309e897cd42c9bfc374;name=git_da0444fc_0;destsuffix=vcs_cache/ab1c9d8044ec55ff95f7d385c76150aeabf000c2a14bc1775a1766dd90f14cda"
19SRC_URI += "git://go.googlesource.com/mod;protocol=https;nobranch=1;shallow=1;rev=bc151c4e8ccc31931553c47d43e41c0efc246096;name=git_13df7481_0;destsuffix=vcs_cache/c837184171f2b9a408933cc7892b7ef003ef72a2d18747dc23c77f54fa57d62b"
20SRC_URI += "git://go.googlesource.com/term;protocol=https;nobranch=1;shallow=1;rev=d59895469ac1327e92a3ee0ecb6dd868315fcd74;name=git_2e975dd2_0;destsuffix=vcs_cache/5c601017bf1fc28cce196476ddd88d281c6d676e09ca5cb41e9b848278953afd"
21SRC_URI += "git://go.googlesource.com/sync;protocol=https;nobranch=1;shallow=1;rev=411f99ef121375a146e962b6eab78b03b7429483;name=git_d7307bee_0;destsuffix=vcs_cache/552bab19670b2a96ac65b9bf6d179b6bbbdd4321531f3f9b5a1e39585df8bd69"
22SRC_URI += "git://go.googlesource.com/crypto;protocol=https;nobranch=1;shallow=1;rev=5bcd010f1cdaf2257509bfb7b43eaad62b7928fd;name=git_f72f7a6f_0;destsuffix=vcs_cache/9fee15430a30cbeeac8229c4916bcd1f80913f48cebc1cc27ef6700c18a12e7c"
23SRC_URI += "git://go.googlesource.com/net;protocol=https;nobranch=1;shallow=1;rev=4542a42604cd159f1adb93c58368079ae37b3bf6;name=git_ed42bd05_0;destsuffix=vcs_cache/caa479eb7dcd0818480849128d1c9b837bb91b666f0a69c3c660088c81936b8a"
24SRC_URI += "git://go.googlesource.com/exp;protocol=https;branch=master;rev=8a7402abbf56ed11a2540c1d8beb569bd29e22d1;name=git_879ce674_0;destsuffix=vcs_cache/3575b051814aade4d8d39c1eaad80043b24b44f1c94ac279ffa894655e6e9268"
25SRC_URI += "git://go.googlesource.com/text;protocol=https;nobranch=1;shallow=1;rev=b2bec85eb9df7c6fcf50218bde3db5e22b35e481;name=git_38515699_0;destsuffix=vcs_cache/b2ed225adb707701e8acdb5ca1f97b68330d6b62805bc3b9f9f3473e33d22e39"
26SRC_URI += "git://go.googlesource.com/telemetry;protocol=https;branch=master;rev=bda55230c457d8271c577c0da94d4b94e3543dd4;name=git_fe729624_0;destsuffix=vcs_cache/55f64daa6b07d1422edbea2ff80ef3c3307bd4fcf3117421ebc3cbcbb7f53bb8"
27SRC_URI += "git://go.googlesource.com/tools;protocol=https;nobranch=1;shallow=1;rev=3057be8f634fdb03e1da1cad9fff3415299ad3ad;name=git_7d9b3b49_0;destsuffix=vcs_cache/0058433bc8aa3748f0d426a99cbdb335695657415da7a591cde9c2fddf000c22"
28SRC_URI += "git://github.com/go-check/check;protocol=https;branch=v1;rev=20d25e2804050c1cd24a7eea1e7a6447dd0e74ec;name=git_fc1e328f_0;destsuffix=vcs_cache/f6f7125ac7ef086ca6395a14a9a28c8c11cd6f8790a8be7cfd6475d1acd0f40b"
29SRC_URI += "git://github.com/go-yaml/yaml;protocol=https;nobranch=1;shallow=1;rev=f6f7691b1fdeb513f56608cd2c32c51f8194bf51;name=git_b0089ab1_0;destsuffix=vcs_cache/8d340fff421a1861f196061b40e49b2f9e802647204935d08e1062b8ecd90b0d"
30SRC_URI += "git://go.googlesource.com/protobuf;protocol=https;nobranch=1;shallow=1;rev=4a76e11653e368b9331815e1eb98e0cedc28997f;name=git_a6c5d6b8_0;destsuffix=vcs_cache/51aac33eb358c68e9ab8f290448d701d1f8d29bca52a65bfb8dda6c98a57eb7d"
31
32# Tag references for shallow cloning
33# Ensures shallow clones include all necessary tags
34BB_GIT_SHALLOW_EXTRA_REFS = "\
35 refs/tags/v0.0.4 \
36 refs/tags/v0.17.0 \
37 refs/tags/v0.20.0 \
38 refs/tags/v0.23.0 \
39 refs/tags/v0.24.0 \
40 refs/tags/v0.26.0 \
41 refs/tags/v0.28.0 \
42 refs/tags/v0.6.0 \
43 refs/tags/v0.8.0 \
44 refs/tags/v1.0.0 \
45 refs/tags/v1.1.1 \
46 refs/tags/v1.34.1 \
47 refs/tags/v1.4.13 \
48 refs/tags/v1.4.2 \
49 refs/tags/v1.5.1 \
50 refs/tags/v1.8.4 \
51 refs/tags/v2.20.1 \
52 refs/tags/v3.0.0 \
53 refs/tags/v3.0.1 \
54"
diff --git a/recipes-networking/cni/relocation.inc b/recipes-networking/cni/relocation.inc
deleted file mode 100644
index 8d4a35db..00000000
--- a/recipes-networking/cni/relocation.inc
+++ /dev/null
@@ -1,30 +0,0 @@
1export sites = "golang.org/x/exp:golang.org/x/exp:force \
2 golang.org/x/net:golang.org/x/net:force \
3 golang.org/x/sys:golang.org/x/sys:force \
4 gopkg.in/yaml.v3:gopkg.in/yaml.v3:force \
5 golang.org/x/text:golang.org/x/text:force \
6 golang.org/x/tools:golang.org/x/tools:force \
7 github.com/onsi/gomega:github.com/onsi/gomega:force \
8 github.com/go-logr/logr:github.com/go-logr/logr:force \
9 github.com/google/pprof:github.com/google/pprof:force \
10 github.com/google/go-cmp:github.com/google/go-cmp:force \
11 github.com/onsi/ginkgo/v2:github.com/onsi/ginkgo/v2:force \
12 github.com/vishvananda/netns:github.com/vishvananda/netns:force \
13 github.com/go-task/slim-sprig/v3:github.com/go-task/slim-sprig/v3:force"
14
15do_compile:prepend() {
16 cd ${S}/src/import
17 for s in $sites; do
18 site_dest=$(echo $s | cut -d: -f1)
19 site_source=$(echo $s | cut -d: -f2)
20 force_flag=$(echo $s | cut -d: -f3)
21 mkdir -p vendor.copy/$site_dest
22 if [ -n "$force_flag" ]; then
23 echo "[INFO] $site_dest: force copying .go files"
24 rm -rf vendor.copy/$site_dest
25 rsync -a --exclude='vendor/' --exclude='.git/' vendor.fetch/$site_source/ vendor.copy/$site_dest
26 else
27 [ -n "$(ls -A vendor.copy/$site_dest/*.go 2> /dev/null)" ] && { echo "[INFO] vendor.fetch/$site_source -> $site_dest: go copy skipped (files present)" ; true ; } || { echo "[INFO] $site_dest: copying .go files" ; rsync -a --exclude='vendor/' --exclude='.git/' vendor.fetch/$site_source/ vendor.copy/$site_dest ; }
28 fi
29 done
30}
diff --git a/recipes-networking/cni/src_uri.inc b/recipes-networking/cni/src_uri.inc
deleted file mode 100644
index e789197a..00000000
--- a/recipes-networking/cni/src_uri.inc
+++ /dev/null
@@ -1,65 +0,0 @@
1# golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
2# [1] git ls-remote https://go.googlesource.com/exp 8a7402abbf56ed11a2540c1d8beb569bd29e22d1
3SRCREV_exp = "8a7402abbf56ed11a2540c1d8beb569bd29e22d1"
4SRC_URI += "git://go.googlesource.com/exp;name=exp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/exp"
5
6# golang.org/x/net v0.28.0
7# [1] git ls-remote https://go.googlesource.com/net 4542a42604cd159f1adb93c58368079ae37b3bf6
8SRCREV_net = "4542a42604cd159f1adb93c58368079ae37b3bf6"
9SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/net"
10
11# golang.org/x/sys v0.23.0
12# [1] git ls-remote https://github.com/golang/sys aa1c4c8554e2f3f54247c309e897cd42c9bfc374
13SRCREV_sys = "aa1c4c8554e2f3f54247c309e897cd42c9bfc374"
14SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys"
15
16# gopkg.in/yaml.v3 v3.0.1
17# [1] git ls-remote https://github.com/go-yaml/yaml f6f7691b1fdeb513f56608cd2c32c51f8194bf51
18SRCREV_yaml.v3 = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51"
19SRC_URI += "git://github.com/go-yaml/yaml;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gopkg.in/yaml.v3"
20
21# golang.org/x/text v0.17.0
22# [1] git ls-remote https://go.googlesource.com/text b2bec85eb9df7c6fcf50218bde3db5e22b35e481
23SRCREV_text = "b2bec85eb9df7c6fcf50218bde3db5e22b35e481"
24SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/text"
25
26# golang.org/x/tools v0.24.0
27# [1] git ls-remote https://go.googlesource.com/tools 3057be8f634fdb03e1da1cad9fff3415299ad3ad
28SRCREV_tools = "3057be8f634fdb03e1da1cad9fff3415299ad3ad"
29SRC_URI += "git://go.googlesource.com/tools;name=tools;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/tools"
30
31# github.com/onsi/gomega v1.34.1
32# [1] git ls-remote https://github.com/onsi/gomega fa057b845528c9336265d6df77e21d827f268c7d
33SRCREV_gomega = "fa057b845528c9336265d6df77e21d827f268c7d"
34SRC_URI += "git://github.com/onsi/gomega;name=gomega;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/gomega"
35
36# github.com/go-logr/logr v1.4.2
37# [1] git ls-remote https://github.com/go-logr/logr 1205f429d540b8b81c2b75a38943afb738dac223
38SRCREV_logr = "1205f429d540b8b81c2b75a38943afb738dac223"
39SRC_URI += "git://github.com/go-logr/logr;name=logr;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/go-logr/logr"
40
41# github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8
42# [1] git ls-remote https://github.com/google/pprof 813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac
43SRCREV_pprof = "813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac"
44SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/google/pprof"
45
46# github.com/google/go-cmp v0.6.0
47# [1] git ls-remote https://github.com/google/go-cmp c3ad8435e7bef96af35732bc0789e5a2278c6d5f
48SRCREV_go-cmp = "c3ad8435e7bef96af35732bc0789e5a2278c6d5f"
49SRC_URI += "git://github.com/google/go-cmp;name=go-cmp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/google/go-cmp"
50
51# github.com/onsi/ginkgo/v2 v2.20.1
52# [1] git ls-remote https://github.com/onsi/ginkgo 4ef0afb9f28f241c352cad6ca9dae8b149e57bc4
53SRCREV_v2 = "4ef0afb9f28f241c352cad6ca9dae8b149e57bc4"
54SRC_URI += "git://github.com/onsi/ginkgo;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/ginkgo/v2"
55
56# github.com/vishvananda/netns v0.0.4
57# [1] git ls-remote https://github.com/vishvananda/netns 7a452d2d15292b2bfb2a2d88e6bdeac156a761b9
58SRCREV_netns = "7a452d2d15292b2bfb2a2d88e6bdeac156a761b9"
59SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/vishvananda/netns"
60
61# github.com/go-task/slim-sprig/v3 v3.0.0
62# [1] git ls-remote https://github.com/go-task/slim-sprig b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894
63SRCREV_v3 = "b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894"
64SRC_URI += "git://github.com/go-task/slim-sprig;name=v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/go-task/slim-sprig/v3"
65
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-12 23:01:07 +0000