diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index aa9902e3..e8d2b44e 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -9,9 +9,9 @@ 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 = "01b3db8e01e491864db3e088a5db401d2f413b00" +SRCREV_flannel_plugin = "a3f52e86452cdcdd2d970bb0f89eef248aed0e7c" SRCREV_FORMAT = "cni_plugins" SRC_URI = "\ git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ @@ -35,8 +35,8 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464 GO_IMPORT = "import" S = "${WORKDIR}/git" -PV = "v1.2.0-rc0+git${SRCREV_cni}" -CNI_VERSION = "v1.2.0" +PV = "v1.2.3+git${SRCREV_cni}" +CNI_VERSION = "v1.2.3" inherit go inherit goarch diff --git a/recipes-networking/cni/files/modules.txt b/recipes-networking/cni/files/modules.txt index 38217c96..dc9f4b91 100644 --- a/recipes-networking/cni/files/modules.txt +++ b/recipes-networking/cni/files/modules.txt @@ -1,26 +1,26 @@ -# github.com/Masterminds/semver/v3 v3.2.1 +# github.com/onsi/ginkgo/v2 v2.20.1 ## explicit -# github.com/onsi/ginkgo/v2 v2.13.2 -## explicit -# github.com/onsi/gomega v1.30.0 +# github.com/onsi/gomega v1.34.1 ## explicit # github.com/vishvananda/netns v0.0.4 ## explicit -# github.com/go-logr/logr v1.3.0 +# github.com/go-logr/logr v1.4.2 ## explicit -# github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 +# github.com/go-task/slim-sprig/v3 v3.0.0 ## explicit # github.com/google/go-cmp v0.6.0 ## explicit -# github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 +# github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 ## explicit -# golang.org/x/net v0.17.0 +# golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 ## explicit -# golang.org/x/sys v0.14.0 +# golang.org/x/net v0.28.0 ## explicit -# golang.org/x/text v0.13.0 +# golang.org/x/sys v0.23.0 ## explicit -# golang.org/x/tools v0.14.0 +# golang.org/x/text v0.17.0 +## explicit +# golang.org/x/tools v0.24.0 ## explicit # gopkg.in/yaml.v3 v3.0.1 ## explicit diff --git a/recipes-networking/cni/relocation.inc b/recipes-networking/cni/relocation.inc index 456e2c8a..c6538dd0 100644 --- a/recipes-networking/cni/relocation.inc +++ b/recipes-networking/cni/relocation.inc @@ -1,4 +1,5 @@ -export sites="golang.org/x/net:golang.org/x/net:force \ +export sites="golang.org/x/exp:golang.org/x/exp:force \ + golang.org/x/net:golang.org/x/net:force \ golang.org/x/sys:golang.org/x/sys:force \ gopkg.in/yaml.v3:gopkg.in/yaml.v3:force \ golang.org/x/text:golang.org/x/text:force \ @@ -9,8 +10,7 @@ export sites="golang.org/x/net:golang.org/x/net:force \ github.com/google/go-cmp:github.com/google/go-cmp:force \ github.com/onsi/ginkgo/v2:github.com/onsi/ginkgo/v2:force \ github.com/vishvananda/netns:github.com/vishvananda/netns:force \ - github.com/go-task/slim-sprig:github.com/go-task/slim-sprig:force \ - github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3:force" + github.com/go-task/slim-sprig/v3:github.com/go-task/slim-sprig/v3:force" do_compile:prepend() { cd ${S}/src/import diff --git a/recipes-networking/cni/src_uri.inc b/recipes-networking/cni/src_uri.inc index fe90f20f..6659c242 100644 --- a/recipes-networking/cni/src_uri.inc +++ b/recipes-networking/cni/src_uri.inc @@ -1,41 +1,46 @@ -# golang.org/x/net v0.17.0 -# [1] git ls-remote https://go.googlesource.com/net b225e7ca6dde1ef5a5ae5ce922861bda011cfabd -SRCREV_net="b225e7ca6dde1ef5a5ae5ce922861bda011cfabd" +# golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 +# [1] git ls-remote https://go.googlesource.com/exp 8a7402abbf56ed11a2540c1d8beb569bd29e22d1 +SRCREV_exp="8a7402abbf56ed11a2540c1d8beb569bd29e22d1" +SRC_URI += "git://go.googlesource.com/exp;name=exp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/exp" + +# golang.org/x/net v0.28.0 +# [1] git ls-remote https://go.googlesource.com/net 4542a42604cd159f1adb93c58368079ae37b3bf6 +SRCREV_net="4542a42604cd159f1adb93c58368079ae37b3bf6" SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/net" -# golang.org/x/sys v0.14.0 -# [1] git ls-remote https://go.googlesource.com/sys cb378ae1ff8cd45e69d4f172df8370bc844e1f86 -SRCREV_sys="cb378ae1ff8cd45e69d4f172df8370bc844e1f86" -SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" +# golang.org/x/sys v0.23.0 +# [1] git ls-remote https://github.com/golang/sys aa1c4c8554e2f3f54247c309e897cd42c9bfc374 +SRCREV_sys="aa1c4c8554e2f3f54247c309e897cd42c9bfc374" +SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" # gopkg.in/yaml.v3 v3.0.1 # [1] git ls-remote https://github.com/go-yaml/yaml f6f7691b1fdeb513f56608cd2c32c51f8194bf51 SRCREV_yaml.v3="f6f7691b1fdeb513f56608cd2c32c51f8194bf51" SRC_URI += "git://github.com/go-yaml/yaml;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/gopkg.in/yaml.v3" -# golang.org/x/text v0.13.0 -# [1] git ls-remote https://go.googlesource.com/text f488e191e67ed95a5b9b7b39024e5a5f5f1ffd02 -SRCREV_text="f488e191e67ed95a5b9b7b39024e5a5f5f1ffd02" +# golang.org/x/text v0.17.0 +# [1] git ls-remote https://go.googlesource.com/text b2bec85eb9df7c6fcf50218bde3db5e22b35e481 +SRCREV_text="b2bec85eb9df7c6fcf50218bde3db5e22b35e481" SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/text" -# golang.org/x/tools v0.14.0 -# [1] git ls-remote https://go.googlesource.com/tools 3f4194ee29d7db9b59757dfff729ef55cf89661c -SRCREV_tools="3f4194ee29d7db9b59757dfff729ef55cf89661c" +# golang.org/x/tools v0.24.0 +# [1] git ls-remote https://go.googlesource.com/tools 3057be8f634fdb03e1da1cad9fff3415299ad3ad +SRCREV_tools="3057be8f634fdb03e1da1cad9fff3415299ad3ad" SRC_URI += "git://go.googlesource.com/tools;name=tools;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/tools" -# github.com/onsi/gomega v1.30.0 -# [1] git ls-remote https://github.com/onsi/gomega f804ac6ada8d36164ecae0513295de8affce1245 -SRCREV_gomega="f804ac6ada8d36164ecae0513295de8affce1245" +# github.com/onsi/gomega v1.34.1 +# [1] git ls-remote https://github.com/onsi/gomega fa057b845528c9336265d6df77e21d827f268c7d +SRCREV_gomega="fa057b845528c9336265d6df77e21d827f268c7d" SRC_URI += "git://github.com/onsi/gomega;name=gomega;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/gomega" -# github.com/go-logr/logr v1.3.0 -# [1] git ls-remote https://github.com/go-logr/logr 8adefbede0fe82bdee4fb8c9c9bdc7bc5d91388f -SRCREV_logr="8adefbede0fe82bdee4fb8c9c9bdc7bc5d91388f" +# github.com/go-logr/logr v1.4.2 +# [1] git ls-remote https://github.com/go-logr/logr 1205f429d540b8b81c2b75a38943afb738dac223 +SRCREV_logr="1205f429d540b8b81c2b75a38943afb738dac223" SRC_URI += "git://github.com/go-logr/logr;name=logr;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/go-logr/logr" -# github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 -# [1] git ls-remote https://github.com/google/pprof 94a9f03dee38882adc8bdfc42cdd6a04f8e7056e -SRCREV_pprof="94a9f03dee38882adc8bdfc42cdd6a04f8e7056e" +# github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 +# [1] git ls-remote https://github.com/google/pprof 813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac +SRCREV_pprof="813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac" SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/google/pprof" # github.com/google/go-cmp v0.6.0 @@ -43,9 +48,9 @@ SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;d SRCREV_go-cmp="c3ad8435e7bef96af35732bc0789e5a2278c6d5f" SRC_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" -# github.com/onsi/ginkgo/v2 v2.13.2 -# [1] git ls-remote https://github.com/onsi/ginkgo 931dc0b144749710bd085d4eb7cd4192a22972d7 -SRCREV_v2="931dc0b144749710bd085d4eb7cd4192a22972d7" +# github.com/onsi/ginkgo/v2 v2.20.1 +# [1] git ls-remote https://github.com/onsi/ginkgo 4ef0afb9f28f241c352cad6ca9dae8b149e57bc4 +SRCREV_v2="4ef0afb9f28f241c352cad6ca9dae8b149e57bc4" SRC_URI += "git://github.com/onsi/ginkgo;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/ginkgo/v2" # github.com/vishvananda/netns v0.0.4 @@ -53,13 +58,8 @@ SRC_URI += "git://github.com/onsi/ginkgo;name=v2;protocol=https;nobranch=1;dests SRCREV_netns="7a452d2d15292b2bfb2a2d88e6bdeac156a761b9" SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/vishvananda/netns" -# github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 -# [1] git ls-remote https://github.com/go-task/slim-sprig 52ccab3ef572c7e1a2c258be183f9a9296d60152 -SRCREV_slim-sprig="52ccab3ef572c7e1a2c258be183f9a9296d60152" -SRC_URI += "git://github.com/go-task/slim-sprig;name=slim-sprig;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/go-task/slim-sprig" - -# github.com/Masterminds/semver/v3 v3.2.1 -# [1] git ls-remote https://github.com/Masterminds/semver e06051f8fcc4c8b4a4990c337b9862a2448722e5 -SRCREV_v3="e06051f8fcc4c8b4a4990c337b9862a2448722e5" -SRC_URI += "git://github.com/Masterminds/semver;name=v3;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/Masterminds/semver/v3" +# github.com/go-task/slim-sprig/v3 v3.0.0 +# [1] git ls-remote https://github.com/go-task/slim-sprig b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894 +SRCREV_v3="b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894" +SRC_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"