diff options
Diffstat (limited to 'recipes-networking')
11 files changed, 151 insertions, 95 deletions
diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index b41b47cf..023aa329 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 \ | |||
9 | is simple to implement. \ | 9 | is simple to implement. \ |
10 | " | 10 | " |
11 | 11 | ||
12 | SRCREV_cni = "b62753aa2bfa365c1ceaff6f25774a8047c896b5" | 12 | SRCREV_cni = "4c9ae43c0eaa85ec1ab27781e9b258f13e7fd0ca" |
13 | SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" | 13 | SRCREV_plugins = "35831f3d23956658aaa3109cbae0ce24d28137e6" |
14 | SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" | 14 | SRCREV_flannel_plugin = "cc21427ce5b2c606ba5ececa0a488452e80d73f8" |
15 | SRCREV_FORMAT = "cni_plugins" | 15 | SRCREV_FORMAT = "cni_plugins" |
16 | SRC_URI = "\ | 16 | SRC_URI = "\ |
17 | git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https \ | 17 | git://github.com/containernetworking/cni.git;branch=main;name=cni;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
18 | git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins;protocol=https \ | 18 | file://modules.txt \ |
19 | git://github.com/flannel-io/cni-plugin;branch=main;name=flannel_plugin;protocol=https;destsuffix=${S}/src/github.com/containernetworking/plugins/plugins/meta/flannel \ | ||
20 | file://modules.txt \ | ||
21 | " | 19 | " |
22 | 20 | ||
21 | SRC_URI += "git://github.com/containernetworking/plugins.git;branch=main;destsuffix=${GO_SRCURI_DESTSUFFIX}/src/github.com/containernetworking/plugins;name=plugins;protocol=https" | ||
22 | 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" | ||
23 | |||
23 | # generated via: | 24 | # generated via: |
24 | # ./scripts/oe-go-mod-autogen.py --repo https://github.com/containernetworking/cni.git --rev <insert your rev here> | 25 | # ./scripts/oe-go-mod-autogen.py --repo https://github.com/containernetworking/cni.git --rev <insert your rev here> |
25 | include src_uri.inc | 26 | include src_uri.inc |
@@ -32,9 +33,10 @@ LICENSE = "Apache-2.0" | |||
32 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" | 33 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" |
33 | 34 | ||
34 | GO_IMPORT = "import" | 35 | GO_IMPORT = "import" |
36 | S = "${WORKDIR}/git" | ||
35 | 37 | ||
36 | PV = "v1.2.0-rc0+git${SRCREV_cni}" | 38 | PV = "v1.2.3+git" |
37 | CNI_VERSION = "v1.2.0" | 39 | CNI_VERSION = "v1.2.3" |
38 | 40 | ||
39 | inherit go | 41 | inherit go |
40 | inherit goarch | 42 | inherit goarch |
@@ -49,11 +51,19 @@ do_compile() { | |||
49 | mkdir -p ${S}/src/github.com/containernetworking | 51 | mkdir -p ${S}/src/github.com/containernetworking |
50 | ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni | 52 | ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni |
51 | 53 | ||
54 | # Fixes: cannot find package "github.com/containernetworking/plugins/plugins/meta/bandwidth" in any of: | ||
55 | # we can't clone the plugin source directly to where it belongs because | ||
56 | # there seems to be an issue in the relocation code from UNPACKDIR to S | ||
57 | # and our LICENSE file is never found. | ||
58 | # This symbolic link arranges for the code to be available where go will | ||
59 | # search during the build | ||
60 | ln -sfr ${S}/src/import/src/github.com/containernetworking/plugins ${B}/src/github.com/containernetworking | ||
61 | |||
52 | # our copied .go files are to be used for the build | 62 | # our copied .go files are to be used for the build |
53 | ln -sf vendor.copy vendor | 63 | ln -sf vendor.copy vendor |
54 | 64 | ||
55 | # inform go that we know what we are doing | 65 | # inform go that we know what we are doing |
56 | cp ${WORKDIR}/modules.txt vendor/ | 66 | cp ${UNPACKDIR}/modules.txt vendor/ |
57 | 67 | ||
58 | export GO111MODULE=off | 68 | export GO111MODULE=off |
59 | 69 | ||
@@ -63,7 +73,7 @@ do_compile() { | |||
63 | cd ${B}/src/github.com/containernetworking/cni/cnitool | 73 | cd ${B}/src/github.com/containernetworking/cni/cnitool |
64 | ${GO} build ${GOBUILDFLAGS} | 74 | ${GO} build ${GOBUILDFLAGS} |
65 | 75 | ||
66 | cd ${B}/src/github.com/containernetworking/plugins | 76 | cd ${B}/src/import/src/github.com/containernetworking/plugins |
67 | PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" | 77 | PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" |
68 | mkdir -p ${B}/plugins/bin/ | 78 | mkdir -p ${B}/plugins/bin/ |
69 | for p in $PLUGINS; do | 79 | for p in $PLUGINS; do |
@@ -84,15 +94,21 @@ do_install() { | |||
84 | install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} | 94 | install -m 755 ${S}/src/import/cnitool/cnitool ${D}/${localbindir} |
85 | install -m 755 -D ${B}/plugins/bin/* ${D}/${localbindir} | 95 | install -m 755 -D ${B}/plugins/bin/* ${D}/${localbindir} |
86 | 96 | ||
97 | # make cnitool more available on the path | ||
98 | install -d ${D}${bindir} | ||
99 | ln -sr ${D}/${localbindir}/cnitool ${D}/${bindir} | ||
100 | |||
87 | # Parts of k8s expect the cni binaries to be available in /opt/cni | 101 | # Parts of k8s expect the cni binaries to be available in /opt/cni |
88 | install -d ${D}/opt/cni | 102 | install -d ${D}/opt/cni |
89 | ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin | 103 | ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin |
90 | } | 104 | } |
91 | 105 | ||
106 | PACKAGECONFIG ?= "ca-certs" | ||
107 | PACKAGECONFIG[ca-certs] = ",,,ca-certificates" | ||
108 | |||
92 | FILES:${PN} += "${libexecdir}/cni/* /opt/cni/bin" | 109 | FILES:${PN} += "${libexecdir}/cni/* /opt/cni/bin" |
93 | 110 | ||
94 | INSANE_SKIP:${PN} += "ldflags already-stripped" | 111 | INSANE_SKIP:${PN} += "ldflags already-stripped" |
95 | 112 | ||
96 | deltask compile_ptest_base | 113 | deltask compile_ptest_base |
97 | 114 | RRECOMMENDS:${PN} += "iptables iproute2" | |
98 | RDEPENDS:${PN} += " ca-certificates" | ||
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 @@ | |||
1 | # github.com/Masterminds/semver/v3 v3.2.1 | 1 | # github.com/onsi/ginkgo/v2 v2.20.1 |
2 | ## explicit | 2 | ## explicit |
3 | # github.com/onsi/ginkgo/v2 v2.13.2 | 3 | # github.com/onsi/gomega v1.34.1 |
4 | ## explicit | ||
5 | # github.com/onsi/gomega v1.30.0 | ||
6 | ## explicit | 4 | ## explicit |
7 | # github.com/vishvananda/netns v0.0.4 | 5 | # github.com/vishvananda/netns v0.0.4 |
8 | ## explicit | 6 | ## explicit |
9 | # github.com/go-logr/logr v1.3.0 | 7 | # github.com/go-logr/logr v1.4.2 |
10 | ## explicit | 8 | ## explicit |
11 | # github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 | 9 | # github.com/go-task/slim-sprig/v3 v3.0.0 |
12 | ## explicit | 10 | ## explicit |
13 | # github.com/google/go-cmp v0.6.0 | 11 | # github.com/google/go-cmp v0.6.0 |
14 | ## explicit | 12 | ## explicit |
15 | # github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 | 13 | # github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 |
14 | ## explicit | ||
15 | # golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 | ||
16 | ## explicit | 16 | ## explicit |
17 | # golang.org/x/net v0.17.0 | 17 | # golang.org/x/net v0.28.0 |
18 | ## explicit | 18 | ## explicit |
19 | # golang.org/x/sys v0.14.0 | 19 | # golang.org/x/sys v0.23.0 |
20 | ## explicit | 20 | ## explicit |
21 | # golang.org/x/text v0.13.0 | 21 | # golang.org/x/text v0.17.0 |
22 | ## explicit | 22 | ## explicit |
23 | # golang.org/x/tools v0.14.0 | 23 | # golang.org/x/tools v0.24.0 |
24 | ## explicit | 24 | ## explicit |
25 | # gopkg.in/yaml.v3 v3.0.1 | 25 | # gopkg.in/yaml.v3 v3.0.1 |
26 | ## explicit | 26 | ## explicit |
diff --git a/recipes-networking/cni/relocation.inc b/recipes-networking/cni/relocation.inc index 456e2c8a..8d4a35db 100644 --- a/recipes-networking/cni/relocation.inc +++ b/recipes-networking/cni/relocation.inc | |||
@@ -1,4 +1,5 @@ | |||
1 | export sites="golang.org/x/net:golang.org/x/net:force \ | 1 | export sites = "golang.org/x/exp:golang.org/x/exp:force \ |
2 | golang.org/x/net:golang.org/x/net:force \ | ||
2 | golang.org/x/sys:golang.org/x/sys:force \ | 3 | golang.org/x/sys:golang.org/x/sys:force \ |
3 | gopkg.in/yaml.v3:gopkg.in/yaml.v3:force \ | 4 | gopkg.in/yaml.v3:gopkg.in/yaml.v3:force \ |
4 | golang.org/x/text:golang.org/x/text:force \ | 5 | golang.org/x/text:golang.org/x/text:force \ |
@@ -9,8 +10,7 @@ export sites="golang.org/x/net:golang.org/x/net:force \ | |||
9 | github.com/google/go-cmp:github.com/google/go-cmp:force \ | 10 | github.com/google/go-cmp:github.com/google/go-cmp:force \ |
10 | github.com/onsi/ginkgo/v2:github.com/onsi/ginkgo/v2:force \ | 11 | github.com/onsi/ginkgo/v2:github.com/onsi/ginkgo/v2:force \ |
11 | github.com/vishvananda/netns:github.com/vishvananda/netns:force \ | 12 | github.com/vishvananda/netns:github.com/vishvananda/netns:force \ |
12 | github.com/go-task/slim-sprig:github.com/go-task/slim-sprig:force \ | 13 | github.com/go-task/slim-sprig/v3:github.com/go-task/slim-sprig/v3:force" |
13 | github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3:force" | ||
14 | 14 | ||
15 | do_compile:prepend() { | 15 | do_compile:prepend() { |
16 | cd ${S}/src/import | 16 | cd ${S}/src/import |
diff --git a/recipes-networking/cni/src_uri.inc b/recipes-networking/cni/src_uri.inc index 6cda91ab..e789197a 100644 --- a/recipes-networking/cni/src_uri.inc +++ b/recipes-networking/cni/src_uri.inc | |||
@@ -1,65 +1,65 @@ | |||
1 | # golang.org/x/net v0.17.0 | 1 | # golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 |
2 | # [1] git ls-remote https://go.googlesource.com/net b225e7ca6dde1ef5a5ae5ce922861bda011cfabd | 2 | # [1] git ls-remote https://go.googlesource.com/exp 8a7402abbf56ed11a2540c1d8beb569bd29e22d1 |
3 | SRCREV_net="b225e7ca6dde1ef5a5ae5ce922861bda011cfabd" | 3 | SRCREV_exp = "8a7402abbf56ed11a2540c1d8beb569bd29e22d1" |
4 | SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/golang.org/x/net" | 4 | SRC_URI += "git://go.googlesource.com/exp;name=exp;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/exp" |
5 | 5 | ||
6 | # golang.org/x/sys v0.14.0 | 6 | # golang.org/x/net v0.28.0 |
7 | # [1] git ls-remote https://go.googlesource.com/sys cb378ae1ff8cd45e69d4f172df8370bc844e1f86 | 7 | # [1] git ls-remote https://go.googlesource.com/net 4542a42604cd159f1adb93c58368079ae37b3bf6 |
8 | SRCREV_sys="cb378ae1ff8cd45e69d4f172df8370bc844e1f86" | 8 | SRCREV_net = "4542a42604cd159f1adb93c58368079ae37b3bf6" |
9 | SRC_URI += "git://go.googlesource.com/sys;name=sys;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/golang.org/x/sys" | 9 | SRC_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 | ||
13 | SRCREV_sys = "aa1c4c8554e2f3f54247c309e897cd42c9bfc374" | ||
14 | SRC_URI += "git://github.com/golang/sys;name=sys;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/sys" | ||
10 | 15 | ||
11 | # gopkg.in/yaml.v3 v3.0.1 | 16 | # gopkg.in/yaml.v3 v3.0.1 |
12 | # [1] git ls-remote https://github.com/go-yaml/yaml f6f7691b1fdeb513f56608cd2c32c51f8194bf51 | 17 | # [1] git ls-remote https://github.com/go-yaml/yaml f6f7691b1fdeb513f56608cd2c32c51f8194bf51 |
13 | SRCREV_yaml.v3="f6f7691b1fdeb513f56608cd2c32c51f8194bf51" | 18 | SRCREV_yaml.v3 = "f6f7691b1fdeb513f56608cd2c32c51f8194bf51" |
14 | SRC_URI += "git://github.com/go-yaml/yaml;name=yaml.v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/gopkg.in/yaml.v3" | 19 | 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" |
15 | 20 | ||
16 | # golang.org/x/text v0.13.0 | 21 | # golang.org/x/text v0.17.0 |
17 | # [1] git ls-remote https://go.googlesource.com/text f488e191e67ed95a5b9b7b39024e5a5f5f1ffd02 | 22 | # [1] git ls-remote https://go.googlesource.com/text b2bec85eb9df7c6fcf50218bde3db5e22b35e481 |
18 | SRCREV_text="f488e191e67ed95a5b9b7b39024e5a5f5f1ffd02" | 23 | SRCREV_text = "b2bec85eb9df7c6fcf50218bde3db5e22b35e481" |
19 | SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/golang.org/x/text" | 24 | SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/text" |
20 | 25 | ||
21 | # golang.org/x/tools v0.14.0 | 26 | # golang.org/x/tools v0.24.0 |
22 | # [1] git ls-remote https://go.googlesource.com/tools 3f4194ee29d7db9b59757dfff729ef55cf89661c | 27 | # [1] git ls-remote https://go.googlesource.com/tools 3057be8f634fdb03e1da1cad9fff3415299ad3ad |
23 | SRCREV_tools="3f4194ee29d7db9b59757dfff729ef55cf89661c" | 28 | SRCREV_tools = "3057be8f634fdb03e1da1cad9fff3415299ad3ad" |
24 | SRC_URI += "git://go.googlesource.com/tools;name=tools;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/golang.org/x/tools" | 29 | SRC_URI += "git://go.googlesource.com/tools;name=tools;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/golang.org/x/tools" |
25 | 30 | ||
26 | # github.com/onsi/gomega v1.30.0 | 31 | # github.com/onsi/gomega v1.34.1 |
27 | # [1] git ls-remote https://github.com/onsi/gomega f804ac6ada8d36164ecae0513295de8affce1245 | 32 | # [1] git ls-remote https://github.com/onsi/gomega fa057b845528c9336265d6df77e21d827f268c7d |
28 | SRCREV_gomega="f804ac6ada8d36164ecae0513295de8affce1245" | 33 | SRCREV_gomega = "fa057b845528c9336265d6df77e21d827f268c7d" |
29 | SRC_URI += "git://github.com/onsi/gomega;name=gomega;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/onsi/gomega" | 34 | SRC_URI += "git://github.com/onsi/gomega;name=gomega;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/gomega" |
30 | 35 | ||
31 | # github.com/go-logr/logr v1.3.0 | 36 | # github.com/go-logr/logr v1.4.2 |
32 | # [1] git ls-remote https://github.com/go-logr/logr 8adefbede0fe82bdee4fb8c9c9bdc7bc5d91388f | 37 | # [1] git ls-remote https://github.com/go-logr/logr 1205f429d540b8b81c2b75a38943afb738dac223 |
33 | SRCREV_logr="8adefbede0fe82bdee4fb8c9c9bdc7bc5d91388f" | 38 | SRCREV_logr = "1205f429d540b8b81c2b75a38943afb738dac223" |
34 | SRC_URI += "git://github.com/go-logr/logr;name=logr;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/go-logr/logr" | 39 | 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" |
35 | 40 | ||
36 | # github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 | 41 | # github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 |
37 | # [1] git ls-remote https://github.com/google/pprof 94a9f03dee38882adc8bdfc42cdd6a04f8e7056e | 42 | # [1] git ls-remote https://github.com/google/pprof 813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac |
38 | SRCREV_pprof="94a9f03dee38882adc8bdfc42cdd6a04f8e7056e" | 43 | SRCREV_pprof = "813a5fbdbec8a66f7a5aedb876e1b2c3ee0f99ac" |
39 | SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/pprof" | 44 | SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/google/pprof" |
40 | 45 | ||
41 | # github.com/google/go-cmp v0.6.0 | 46 | # github.com/google/go-cmp v0.6.0 |
42 | # [1] git ls-remote https://github.com/google/go-cmp c3ad8435e7bef96af35732bc0789e5a2278c6d5f | 47 | # [1] git ls-remote https://github.com/google/go-cmp c3ad8435e7bef96af35732bc0789e5a2278c6d5f |
43 | SRCREV_go-cmp="c3ad8435e7bef96af35732bc0789e5a2278c6d5f" | 48 | SRCREV_go-cmp = "c3ad8435e7bef96af35732bc0789e5a2278c6d5f" |
44 | SRC_URI += "git://github.com/google/go-cmp;name=go-cmp;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/go-cmp" | 49 | 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" |
45 | 50 | ||
46 | # github.com/onsi/ginkgo/v2 v2.13.2 | 51 | # github.com/onsi/ginkgo/v2 v2.20.1 |
47 | # [1] git ls-remote https://github.com/onsi/ginkgo 931dc0b144749710bd085d4eb7cd4192a22972d7 | 52 | # [1] git ls-remote https://github.com/onsi/ginkgo 4ef0afb9f28f241c352cad6ca9dae8b149e57bc4 |
48 | SRCREV_v2="931dc0b144749710bd085d4eb7cd4192a22972d7" | 53 | SRCREV_v2 = "4ef0afb9f28f241c352cad6ca9dae8b149e57bc4" |
49 | SRC_URI += "git://github.com/onsi/ginkgo;name=v2;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/onsi/ginkgo/v2" | 54 | SRC_URI += "git://github.com/onsi/ginkgo;name=v2;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/onsi/ginkgo/v2" |
50 | 55 | ||
51 | # github.com/vishvananda/netns v0.0.4 | 56 | # github.com/vishvananda/netns v0.0.4 |
52 | # [1] git ls-remote https://github.com/vishvananda/netns 7a452d2d15292b2bfb2a2d88e6bdeac156a761b9 | 57 | # [1] git ls-remote https://github.com/vishvananda/netns 7a452d2d15292b2bfb2a2d88e6bdeac156a761b9 |
53 | SRCREV_netns="7a452d2d15292b2bfb2a2d88e6bdeac156a761b9" | 58 | SRCREV_netns = "7a452d2d15292b2bfb2a2d88e6bdeac156a761b9" |
54 | SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/vishvananda/netns" | 59 | SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${GO_SRCURI_DESTSUFFIX}/vendor.fetch/github.com/vishvananda/netns" |
55 | |||
56 | # github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 | ||
57 | # [1] git ls-remote https://github.com/go-task/slim-sprig 52ccab3ef572c7e1a2c258be183f9a9296d60152 | ||
58 | SRCREV_slim-sprig="52ccab3ef572c7e1a2c258be183f9a9296d60152" | ||
59 | SRC_URI += "git://github.com/go-task/slim-sprig;name=slim-sprig;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/go-task/slim-sprig" | ||
60 | 60 | ||
61 | # github.com/Masterminds/semver/v3 v3.2.1 | 61 | # github.com/go-task/slim-sprig/v3 v3.0.0 |
62 | # [1] git ls-remote https://github.com/Masterminds/semver e06051f8fcc4c8b4a4990c337b9862a2448722e5 | 62 | # [1] git ls-remote https://github.com/go-task/slim-sprig b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894 |
63 | SRCREV_v3="e06051f8fcc4c8b4a4990c337b9862a2448722e5" | 63 | SRCREV_v3 = "b05cce61fffa5c6dea6ac8b9a1f12b6e3fb7c894" |
64 | SRC_URI += "git://github.com/Masterminds/semver;name=v3;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Masterminds/semver/v3" | 64 | 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" |
65 | 65 | ||
diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb index 357275c1..be41d2b8 100644 --- a/recipes-networking/netns/netns_git.bb +++ b/recipes-networking/netns/netns_git.bb | |||
@@ -3,7 +3,7 @@ SUMMARY = "Runc hook for setting up default bridge networking." | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7bac31faf84a2d7e88972f562a3ebbe5" | 4 | LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7bac31faf84a2d7e88972f562a3ebbe5" |
5 | 5 | ||
6 | SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \ | 6 | SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} \ |
7 | file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \ | 7 | file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \ |
8 | " | 8 | " |
9 | SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4" | 9 | SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4" |
diff --git a/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch b/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch index 472ecb57..df08e3d9 100644 --- a/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch +++ b/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch | |||
@@ -25,11 +25,11 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> | |||
25 | Makefile.am | 2 +- | 25 | Makefile.am | 2 +- |
26 | 1 file changed, 1 insertion(+), 1 deletion(-) | 26 | 1 file changed, 1 insertion(+), 1 deletion(-) |
27 | 27 | ||
28 | diff --git a/Makefile.am b/Makefile.am | 28 | Index: git/Makefile.am |
29 | index 28e85d422..031bbf39c 100644 | 29 | =================================================================== |
30 | --- a/Makefile.am | 30 | --- git.orig/Makefile.am |
31 | +++ b/Makefile.am | 31 | +++ git/Makefile.am |
32 | @@ -154,7 +154,7 @@ SUFFIXES += .in | 32 | @@ -162,7 +162,7 @@ SUFFIXES += .in |
33 | -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ | 33 | -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ |
34 | -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ | 34 | -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ |
35 | -e 's,[@]DBDIR[@],$(DBDIR),g' \ | 35 | -e 's,[@]DBDIR[@],$(DBDIR),g' \ |
@@ -37,7 +37,4 @@ index 28e85d422..031bbf39c 100644 | |||
37 | + -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \ | 37 | + -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \ |
38 | -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ | 38 | -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ |
39 | -e 's,[@]VERSION[@],$(VERSION),g' \ | 39 | -e 's,[@]VERSION[@],$(VERSION),g' \ |
40 | -e 's,[@]localstatedir[@],$(localstatedir),g' \ | 40 | -e 's,[@]VERSION_SUFFIX[@],$(VERSION_SUFFIX),g' \ |
41 | -- | ||
42 | 2.35.5 | ||
43 | |||
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch index 571753a5..abad1458 100644 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch | |||
@@ -16,6 +16,13 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> | |||
16 | refresh patch to fix patch-fuzz warning | 16 | refresh patch to fix patch-fuzz warning |
17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | 17 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
18 | 18 | ||
19 | Refresh patch to fix file ptest/tests/atlocal | ||
20 | contains reference to TMPDIR [buildpaths]. The fix is: | ||
21 | - set EGREP to "grep -E" in ptest/tests/atlocal | ||
22 | - set CFLAGS to " " in ptest/tests/atlocal | ||
23 | |||
24 | Signed-off-by: Bin Lan <bin.lan.cn@windriver.com> | ||
25 | |||
19 | Upstream-Status: Inappropriate [embedded specific] | 26 | Upstream-Status: Inappropriate [embedded specific] |
20 | --- | 27 | --- |
21 | Makefile.am | 1 + | 28 | Makefile.am | 1 + |
@@ -37,7 +44,7 @@ new file mode 100644 | |||
37 | index 0000000..0b4587c | 44 | index 0000000..0b4587c |
38 | --- /dev/null | 45 | --- /dev/null |
39 | +++ b/test.mk | 46 | +++ b/test.mk |
40 | @@ -0,0 +1,74 @@ | 47 | @@ -0,0 +1,76 @@ |
41 | +TEST_DEST ?= ${prefix}/lib/openvswitch | 48 | +TEST_DEST ?= ${prefix}/lib/openvswitch |
42 | +TEST_ROOT ?= ${prefix}/lib/openvswitch | 49 | +TEST_ROOT ?= ${prefix}/lib/openvswitch |
43 | +TEST_DEPEND = | 50 | +TEST_DEPEND = |
@@ -112,3 +119,5 @@ index 0000000..0b4587c | |||
112 | + sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite | 119 | + sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite |
113 | + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite | 120 | + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite |
114 | + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite | 121 | + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite |
122 | + sed -i 's|EGREP=.*|EGREP='"'"'grep -E'"'"'|g' $(TEST_DEST)/tests/atlocal | ||
123 | + sed -i 's|CFLAGS=.*|CFLAGS='"'"' '"'"'|g' $(TEST_DEST)/tests/atlocal | ||
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc index 767a41e6..a792a903 100644 --- a/recipes-networking/openvswitch/openvswitch.inc +++ b/recipes-networking/openvswitch/openvswitch.inc | |||
@@ -104,13 +104,13 @@ do_install:prepend() { | |||
104 | 104 | ||
105 | do_install:append() { | 105 | do_install:append() { |
106 | install -d ${D}/${sysconfdir}/default/ | 106 | install -d ${D}/${sysconfdir}/default/ |
107 | install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch | 107 | install -m 660 ${UNPACKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch |
108 | install -d ${D}/${sysconfdir}/openvswitch-testcontroller | 108 | install -d ${D}/${sysconfdir}/openvswitch-testcontroller |
109 | install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller | 109 | install -m 660 ${UNPACKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller |
110 | 110 | ||
111 | install -d ${D}/${sysconfdir}/init.d/ | 111 | install -d ${D}/${sysconfdir}/init.d/ |
112 | install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller | 112 | install -m 755 ${UNPACKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller |
113 | install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch | 113 | install -m 755 ${UNPACKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch |
114 | true || rm -fr ${D}/${datadir}/${PN}/pki | 114 | true || rm -fr ${D}/${datadir}/${PN}/pki |
115 | 115 | ||
116 | install -d ${D}/${sysconfdir}/sysconfig | 116 | install -d ${D}/${sysconfdir}/sysconfig |
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index b7d9b8dd..8637165a 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb | |||
@@ -14,13 +14,13 @@ RDEPENDS:${PN}-ptest += "\ | |||
14 | " | 14 | " |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | PV = "3.3.0" | 17 | PV = "3.5.0" |
18 | CVE_VERSION = "3.3.0" | 18 | CVE_VERSION = "3.5.0" |
19 | 19 | ||
20 | FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:" | 20 | FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:" |
21 | 21 | ||
22 | SRCREV = "1c1f173ce8a8534e262083bc4db3ee15f05231c0" | 22 | SRCREV = "445594155310a881ea4a269e2a424a870a89402c" |
23 | SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.3 \ | 23 | SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.5 \ |
24 | file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ | 24 | file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ |
25 | file://run-ptest \ | 25 | file://run-ptest \ |
26 | file://disable_m4_check.patch \ | 26 | file://disable_m4_check.patch \ |
diff --git a/recipes-networking/passt/passt_git.bb b/recipes-networking/passt/passt_git.bb new file mode 100644 index 00000000..1c018cc0 --- /dev/null +++ b/recipes-networking/passt/passt_git.bb | |||
@@ -0,0 +1,34 @@ | |||
1 | SUMMARY = "User-mode networking daemons for virtual machines and namespaces" | ||
2 | LICENSE = "GPL-2.0-or-later & BSD-3-Clause" | ||
3 | LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0-or-later.txt;md5=3d26203303a722dedc6bf909d95ba815 \ | ||
4 | file://LICENSES/BSD-3-Clause.txt;md5=c6c623ff088c13278097b9f79637ca77" | ||
5 | |||
6 | DEPENDS += "coreutils-native" | ||
7 | |||
8 | EXTRA_OEMAKE += "\ | ||
9 | 'DESTDIR=${D}' \ | ||
10 | 'prefix=${prefix}' \ | ||
11 | 'bindir=${bindir}' \ | ||
12 | 'sharedir=${datadir}' \ | ||
13 | 'sysconfdir=${sysconfdir}' \ | ||
14 | " | ||
15 | |||
16 | SRC_URI = "git://passt.top/passt;branch=master" | ||
17 | |||
18 | PV = "2025_03_20+git" | ||
19 | SRCREV = "cf4d3f05c9263d1b0a88dbbcf9e48d34cac6708e" | ||
20 | |||
21 | S = "${WORKDIR}/git" | ||
22 | |||
23 | do_configure () { | ||
24 | : | ||
25 | } | ||
26 | |||
27 | do_compile () { | ||
28 | oe_runmake | ||
29 | } | ||
30 | |||
31 | do_install () { | ||
32 | oe_runmake install | ||
33 | } | ||
34 | |||
diff --git a/recipes-networking/slirp4netns/slirp4netns_git.bb b/recipes-networking/slirp4netns/slirp4netns_git.bb index 33a5636a..8125bb46 100644 --- a/recipes-networking/slirp4netns/slirp4netns_git.bb +++ b/recipes-networking/slirp4netns/slirp4netns_git.bb | |||
@@ -6,10 +6,10 @@ network namespace to the usermode TCP/IP stack ("slirp")." | |||
6 | LICENSE = "GPL-2.0-or-later" | 6 | LICENSE = "GPL-2.0-or-later" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26" |
8 | 8 | ||
9 | SRCREV = "323aa69a68362a432f15d5e8050e74a0637aaf1e" | 9 | SRCREV = "ee1542e1532e6a7f266b8b6118973ab3b10a8bb5" |
10 | SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1;protocol=https" | 10 | SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1;protocol=https" |
11 | 11 | ||
12 | PV = "1.2.0+git" | 12 | PV = "1.3.1+git" |
13 | 13 | ||
14 | inherit features_check | 14 | inherit features_check |
15 | REQUIRED_DISTRO_FEATURES ?= "seccomp" | 15 | REQUIRED_DISTRO_FEATURES ?= "seccomp" |