diff options
Diffstat (limited to 'recipes-networking')
17 files changed, 326 insertions, 153 deletions
diff --git a/recipes-networking/cni/README.md b/recipes-networking/cni/README.md new file mode 100644 index 00000000..3f5f6401 --- /dev/null +++ b/recipes-networking/cni/README.md @@ -0,0 +1,3 @@ +# CNI debug tip: + +CNI_PATH=/opt/cni/bin /opt/cni/bin/cnitool add uniquename /var/run/netns/testingns
\ No newline at end of file diff --git a/recipes-networking/cni/cni_git.bb b/recipes-networking/cni/cni_git.bb index 3ad939bd..b41b47cf 100644 --- a/recipes-networking/cni/cni_git.bb +++ b/recipes-networking/cni/cni_git.bb @@ -9,35 +9,59 @@ Because of this focus, CNI has a wide range of support and the specification \ is simple to implement. \ " -SRCREV_cni = "4cfb7b568922a3c79a23e438dc52fe537fc9687e" -# Version 0.8.5 -SRCREV_plugins = "1f33fb729ae2b8900785f896df2dc1f6fe5e8239" +SRCREV_cni = "b62753aa2bfa365c1ceaff6f25774a8047c896b5" +SRCREV_plugins = "b6a0e0bc96906f0d3bd6bfcaab0b5ae72292f46c" +SRCREV_flannel_plugin = "6464faacf5c00e25321573225d74638455ef03a0" +SRCREV_FORMAT = "cni_plugins" SRC_URI = "\ - git://github.com/containernetworking/cni.git;nobranch=1;name=cni \ - git://github.com/containernetworking/plugins.git;nobranch=1;destsuffix=${S}/src/github.com/containernetworking/plugins;name=plugins \ + 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 \ " -RPROVIDES_${PN} += "kubernetes-cni" +# generated via: +# ./scripts/oe-go-mod-autogen.py --repo https://github.com/containernetworking/cni.git --rev <insert your rev here> +include src_uri.inc + +DEPENDS = " \ + rsync-native \ + " LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" GO_IMPORT = "import" -PV = "0.7.1+git${SRCREV_cni}" +PV = "v1.2.0-rc0+git${SRCREV_cni}" +CNI_VERSION = "v1.2.0" inherit go inherit goarch +# https://github.com/llvm/llvm-project/issues/53999 +TOOLCHAIN = "gcc" + +# sets the "sites" variable. +include relocation.inc + do_compile() { mkdir -p ${S}/src/github.com/containernetworking ln -sfr ${S}/src/import ${S}/src/github.com/containernetworking/cni + # 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/ + + export GO111MODULE=off + cd ${B}/src/github.com/containernetworking/cni/libcni - ${GO} build + ${GO} build ${GOBUILDFLAGS} cd ${B}/src/github.com/containernetworking/cni/cnitool - ${GO} build + ${GO} build ${GOBUILDFLAGS} cd ${B}/src/github.com/containernetworking/plugins PLUGINS="$(ls -d plugins/meta/*; ls -d plugins/ipam/*; ls -d plugins/main/* | grep -v windows)" @@ -45,10 +69,12 @@ do_compile() { for p in $PLUGINS; do plugin="$(basename "$p")" echo "building: $p" - ${GO} build -mod=vendor -o ${B}/plugins/bin/$plugin github.com/containernetworking/plugins/$p + ${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 done } +do_compile[cleandirs] = "${B}/plugins" + do_install() { localbindir="${libexecdir}/cni/" @@ -63,8 +89,10 @@ do_install() { ln -sf ${libexecdir}/cni/ ${D}/opt/cni/bin } -FILES_${PN} += "${libexecdir}/cni/* /opt/cni/bin" +FILES:${PN} += "${libexecdir}/cni/* /opt/cni/bin" -INSANE_SKIP_${PN} += "ldflags already-stripped" +INSANE_SKIP:${PN} += "ldflags already-stripped" deltask compile_ptest_base + +RDEPENDS:${PN} += " ca-certificates" diff --git a/recipes-networking/cni/files/modules.txt b/recipes-networking/cni/files/modules.txt new file mode 100644 index 00000000..38217c96 --- /dev/null +++ b/recipes-networking/cni/files/modules.txt @@ -0,0 +1,26 @@ +# github.com/Masterminds/semver/v3 v3.2.1 +## explicit +# github.com/onsi/ginkgo/v2 v2.13.2 +## explicit +# github.com/onsi/gomega v1.30.0 +## explicit +# github.com/vishvananda/netns v0.0.4 +## explicit +# github.com/go-logr/logr v1.3.0 +## explicit +# github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 +## explicit +# github.com/google/go-cmp v0.6.0 +## explicit +# github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 +## explicit +# golang.org/x/net v0.17.0 +## explicit +# golang.org/x/sys v0.14.0 +## explicit +# golang.org/x/text v0.13.0 +## explicit +# golang.org/x/tools v0.14.0 +## explicit +# gopkg.in/yaml.v3 v3.0.1 +## explicit diff --git a/recipes-networking/cni/relocation.inc b/recipes-networking/cni/relocation.inc new file mode 100644 index 00000000..456e2c8a --- /dev/null +++ b/recipes-networking/cni/relocation.inc @@ -0,0 +1,30 @@ +export sites="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 \ + golang.org/x/tools:golang.org/x/tools:force \ + github.com/onsi/gomega:github.com/onsi/gomega:force \ + github.com/go-logr/logr:github.com/go-logr/logr:force \ + github.com/google/pprof:github.com/google/pprof: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" + +do_compile:prepend() { + cd ${S}/src/import + for s in $sites; do + site_dest=$(echo $s | cut -d: -f1) + site_source=$(echo $s | cut -d: -f2) + force_flag=$(echo $s | cut -d: -f3) + mkdir -p vendor.copy/$site_dest + if [ -n "$force_flag" ]; then + echo "[INFO] $site_dest: force copying .go files" + rm -rf vendor.copy/$site_dest + rsync -a --exclude='vendor/' --exclude='.git/' vendor.fetch/$site_source/ vendor.copy/$site_dest + else + [ -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 ; } + fi + done +} diff --git a/recipes-networking/cni/src_uri.inc b/recipes-networking/cni/src_uri.inc new file mode 100644 index 00000000..6cda91ab --- /dev/null +++ b/recipes-networking/cni/src_uri.inc @@ -0,0 +1,65 @@ +# golang.org/x/net v0.17.0 +# [1] git ls-remote https://go.googlesource.com/net b225e7ca6dde1ef5a5ae5ce922861bda011cfabd +SRCREV_net="b225e7ca6dde1ef5a5ae5ce922861bda011cfabd" +SRC_URI += "git://go.googlesource.com/net;name=net;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/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=${WORKDIR}/${BP}/src/import/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=${WORKDIR}/${BP}/src/import/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" +SRC_URI += "git://go.googlesource.com/text;name=text;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/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" +SRC_URI += "git://go.googlesource.com/tools;name=tools;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/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" +SRC_URI += "git://github.com/onsi/gomega;name=gomega;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/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" +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" + +# github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 +# [1] git ls-remote https://github.com/google/pprof 94a9f03dee38882adc8bdfc42cdd6a04f8e7056e +SRCREV_pprof="94a9f03dee38882adc8bdfc42cdd6a04f8e7056e" +SRC_URI += "git://github.com/google/pprof;name=pprof;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/google/pprof" + +# github.com/google/go-cmp v0.6.0 +# [1] git ls-remote https://github.com/google/go-cmp c3ad8435e7bef96af35732bc0789e5a2278c6d5f +SRCREV_go-cmp="c3ad8435e7bef96af35732bc0789e5a2278c6d5f" +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" + +# github.com/onsi/ginkgo/v2 v2.13.2 +# [1] git ls-remote https://github.com/onsi/ginkgo 931dc0b144749710bd085d4eb7cd4192a22972d7 +SRCREV_v2="931dc0b144749710bd085d4eb7cd4192a22972d7" +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" + +# github.com/vishvananda/netns v0.0.4 +# [1] git ls-remote https://github.com/vishvananda/netns 7a452d2d15292b2bfb2a2d88e6bdeac156a761b9 +SRCREV_netns="7a452d2d15292b2bfb2a2d88e6bdeac156a761b9" +SRC_URI += "git://github.com/vishvananda/netns;name=netns;protocol=https;nobranch=1;destsuffix=${WORKDIR}/${BP}/src/import/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=${WORKDIR}/${BP}/src/import/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=${WORKDIR}/${BP}/src/import/vendor.fetch/github.com/Masterminds/semver/v3" + diff --git a/recipes-networking/netns/netns_git.bb b/recipes-networking/netns/netns_git.bb index da6aac21..357275c1 100644 --- a/recipes-networking/netns/netns_git.bb +++ b/recipes-networking/netns/netns_git.bb @@ -1,13 +1,13 @@ HOMEPAGE = "https://github.com/jfrazelle/netns" SUMMARY = "Runc hook for setting up default bridge networking." LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=48ef0979a2bcc3fae14ff30b8a7f5dbf" +LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=7bac31faf84a2d7e88972f562a3ebbe5" -SRC_URI = "git://github.com/genuinetools/netns;branch=master \ +SRC_URI = "git://github.com/genuinetools/netns;branch=master;protocol=https \ file://Makefile-force-rebuilding-all-packages-to-avoid-cgo.patch \ " -SRCREV = "9b103a19b917cc3762a33b7d78244b1d5e45ccfd" -PV = "0.5.3" +SRCREV = "00d5d07ab1c8afcf481ffa5958719943b6ecfde4" +PV = "0.5.3+git" GO_IMPORT = "import" S = "${WORKDIR}/git" @@ -19,7 +19,7 @@ EXTRA_OEMAKE = "GO='${GO}'" do_compile() { export GOARCH="${TARGET_GOARCH}" - export GOROOT="${STAGING_LIBDIR_NATIVE}/${TARGET_SYS}/go" + export GOROOT="${STAGING_LIBDIR}/go" # Setup vendor directory so that it can be used in GOPATH. # # Go looks in a src directory under any directory in GOPATH but netns @@ -29,8 +29,7 @@ do_compile() { # they are not under the src directory. ln -sfn . "${S}/src/import/vendor/src" mkdir -p "${S}/src/import/vendor/src/github.com/genuinetools/netns" - ln -sfn "${S}/src/import/ipallocator" "${S}/src/import/vendor/src/github.com/genuinetools/netns/ipallocator" - ln -sfn "${S}/src/import/version" "${S}/src/import/vendor/src/github.com/genuinetools/netns/version" + export GOPATH="${S}/src/import/vendor" # Pass the needed cflags/ldflags so that cgo @@ -38,8 +37,9 @@ do_compile() { export CGO_ENABLED="1" export CFLAGS="" export LDFLAGS="" - export CGO_CFLAGS="${BUILDSDK_CFLAGS} --sysroot=${STAGING_DIR_TARGET}" - export CGO_LDFLAGS="${BUILDSDK_LDFLAGS} --sysroot=${STAGING_DIR_TARGET}" + export CGO_CFLAGS="${TARGET_CFLAGS}" + export CGO_LDFLAGS="${TARGET_LDFLAGS}" + export GOFLAGS="-mod=vendor -trimpath" cd ${S}/src/import # Static builds work but are not recommended. See Makefile*cgo patch. diff --git a/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch b/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch index cb708dea..4fe3abd8 100644 --- a/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch +++ b/recipes-networking/openvswitch/files/openvswitch-add-ptest.patch @@ -1,5 +1,7 @@ Add test-install rule to support ptest execution +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Radu Patriu <radu.patriu@enea.com> Index: openvswitch-2.1.2/Makefile.am diff --git a/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch index 113bc91d..ffa8af0e 100644 --- a/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch +++ b/recipes-networking/openvswitch/files/python-switch-remaining-scripts-to-use-python3.patch @@ -5,6 +5,8 @@ Subject: [PATCH] python: switch remaining scripts to use python3 Work to remove the main openvswitch package's dependency on python 2. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- 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 new file mode 100644 index 00000000..472ecb57 --- /dev/null +++ b/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch @@ -0,0 +1,43 @@ +From 5053d98f6595653dc02485810fda94348b6e8a1b Mon Sep 17 00:00:00 2001 +From: Xiangyu Chen <xiangyu.chen@windriver.com> +Date: Fri, 21 Jul 2023 08:47:51 +0000 +Subject: [PATCH] Makefile.am: set the python3 interpreter with /usr/bin/env + +The variable "PYTHON3" just python3, this cause the following scripts error: +/usr/sbin/ovs-bugtool Not found the interpreter python3 +/usr/bin/ovs-pcap Not found the interpreter python3 +/usr/bin/ovs-test Not found the interpreter python3 +/usr/bin/ovs-tcpdump Not found the interpreter python3 +/usr/bin/ovs-tcpundump Not found the interpreter python3 +/usr/bin/ovs-vlan-test Not found the interpreter python3 +/usr/bin/ovs-l3ping Not found the interpreter python3 +/usr/bin/ovs-parse-backtrace Not found the interpreter python3 +/usr/bin/ovs-dpctl-top Not found the interpreter python3 +/usr/share/openvswitch/scripts/ovs-check-dead-ifs Not found the interpreter python3 +/usr/share/openvswitch/scripts/ovs-check-dead-ifs Not found the interpreter python3 +/usr/share/openvswitch/scripts/ovs-monitor-ipsec Not found the interpreter python3 +/usr/share/openvswitch/scripts/ovs-vtep Not found the interpreter python3 + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 28e85d422..031bbf39c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -154,7 +154,7 @@ SUFFIXES += .in + -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ + -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ + -e 's,[@]DBDIR[@],$(DBDIR),g' \ +- -e 's,[@]PYTHON3[@],$(PYTHON3),g' \ ++ -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \ + -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ + -e 's,[@]VERSION[@],$(VERSION),g' \ + -e 's,[@]localstatedir[@],$(localstatedir),g' \ +-- +2.35.5 + diff --git a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch index 711a1487..43735132 100644 --- a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch +++ b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch @@ -3,17 +3,19 @@ From: Amy Fong <amy.fong@windriver.com> Date: Thu, 29 Jan 2015 09:56:03 -0500 Subject: [PATCH] Disable m4 file test where sources are built from git. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Amy Fong <amy.fong@windriver.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index ff7d70a..2fc1f13 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -187,7 +187,7 @@ CLEAN_LOCAL += clean-pycov +Index: git/Makefile.am +=================================================================== +--- git.orig/Makefile.am ++++ git/Makefile.am +@@ -194,7 +194,7 @@ # If we're checked out from a Git repository, make sure that every # file that is in Git is distributed. @@ -21,4 +23,4 @@ index ff7d70a..2fc1f13 100644 +# ALL_LOCAL += dist-hook-git dist-hook-git: distfiles @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \ - (cd datapath && $(MAKE) distfiles); \ + (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \ diff --git a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch deleted file mode 100644 index 5e5a38d9..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b7fb1346702d59af67435487254ef35940bc16a Mon Sep 17 00:00:00 2001 -From: "Hongzhi.Song" <hongzhi.song@windriver.com> -Date: Wed, 23 Jan 2019 03:41:30 -0500 -Subject: [PATCH] datapatch/linux: Specify install path for kernel module - -Signed-off-by: Amy Fong <amy.fong@windriver.com> -Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com> ---- - datapath/linux/Makefile.main.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in -index 328bbfb..6dcc8d0 100644 ---- a/datapath/linux/Makefile.main.in -+++ b/datapath/linux/Makefile.main.in -@@ -71,8 +71,8 @@ default: - $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules - - modules_install: -- $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules_install -- /sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` -+ $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH} -+ #/sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h` - endif - - # Much of the kernel build system in this file is derived from Intel's --- -2.8.1 - 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 fc74debb..571753a5 100644 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch @@ -15,6 +15,8 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> refresh patch to fix patch-fuzz warning Signed-off-by: Changqing Li <changqing.li@windriver.com> + +Upstream-Status: Inappropriate [embedded specific] --- Makefile.am | 1 + test.mk | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch index 0438cf88..1505d47a 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-create-runtime-dirs.patch @@ -1,6 +1,6 @@ -From 6876e0c155b7f83e1f8545446e2dd69c2b7989f2 Mon Sep 17 00:00:00 2001 +From fc540d0dee7d1f801c781905735f0f4619aba511 Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Tue, 4 Sep 2018 15:38:59 -0400 +Date: Thu, 11 Mar 2021 11:26:58 +0800 Subject: [PATCH] systemd: create runtime dirs The recommendation would be to make use of "RuntimeDirectory=" and @@ -9,23 +9,23 @@ upstream service file uses 'chown' we will match this by using 'mkdir'. Without this the service will fail to start since these directories won't exist. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- - rhel/usr_lib_systemd_system_ovsdb-server.service | 1 + - 1 file changed, 1 insertion(+) + rhel/usr_lib_systemd_system_ovsdb-server.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index aad557f..69b0bf6 100644 ---- a/rhel/usr_lib_systemd_system_ovsdb-server.service -+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -11,6 +11,7 @@ PIDFile=/var/run/openvswitch/ovsdb-server.pid - Restart=on-failure - EnvironmentFile=/etc/openvswitch/default.conf - EnvironmentFile=-/etc/sysconfig/openvswitch +Index: git/rhel/usr_lib_systemd_system_ovsdb-server.service +=================================================================== +--- git.orig/rhel/usr_lib_systemd_system_ovsdb-server.service ++++ git/rhel/usr_lib_systemd_system_ovsdb-server.service +@@ -17,7 +17,7 @@ + # remove openvswitch.useropts first to reload a fresh + # OVS_USER_ID from default.conf or sysconfig. + ExecStartPre=/bin/rm -f /run/openvswitch.useropts +- +ExecStartPre=-/bin/mkdir /var/run/openvswitch /var/log/openvswitch - ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch - ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' + ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch + ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' --- -2.7.4 - diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch index aae44fe7..7fe0236e 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch @@ -1,22 +1,24 @@ -From efd6b8f03ef7278d2477833f84bb8488bd0c346d Mon Sep 17 00:00:00 2001 +From a79bf6caf915d2a00a52a73033b1c903f2df894f Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> -Date: Tue, 29 May 2018 18:57:46 +0000 +Date: Wed, 10 Mar 2021 11:17:37 +0800 Subject: [PATCH 1/2] systemd: update tool paths We are using the rhel files but we install our tools in a slightly different path, update accordingly. +Upstream-Status: Inappropriate [embedded specific] + Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> --- rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++-- - rhel/usr_lib_systemd_system_ovsdb-server.service | 6 +++--- - 2 files changed, 5 insertions(+), 5 deletions(-) + rhel/usr_lib_systemd_system_ovsdb-server.service | 8 ++++---- + 2 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -index ff43dae..f88b57c 100644 ---- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in -@@ -17,8 +17,8 @@ EnvironmentFile=-/etc/sysconfig/openvswitch +Index: git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +=================================================================== +--- git.orig/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in ++++ git/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in +@@ -17,8 +17,8 @@ EnvironmentFile=-/run/openvswitch.useropts LimitSTACK=2M @begin_dpdk@ @@ -27,23 +29,23 @@ index ff43dae..f88b57c 100644 @end_dpdk@ ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ -diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index 4c170c0..aad557f 100644 ---- a/rhel/usr_lib_systemd_system_ovsdb-server.service -+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service -@@ -11,9 +11,9 @@ PIDFile=/var/run/openvswitch/ovsdb-server.pid - Restart=on-failure - EnvironmentFile=/etc/openvswitch/default.conf - EnvironmentFile=-/etc/sysconfig/openvswitch --ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch --ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' +Index: git/rhel/usr_lib_systemd_system_ovsdb-server.service +=================================================================== +--- git.orig/rhel/usr_lib_systemd_system_ovsdb-server.service ++++ git/rhel/usr_lib_systemd_system_ovsdb-server.service +@@ -16,11 +16,11 @@ + # Environment is reloaded for each Exec*, make sure to + # remove openvswitch.useropts first to reload a fresh + # OVS_USER_ID from default.conf or sysconfig. +-ExecStartPre=/usr/bin/rm -f /run/openvswitch.useropts ++ExecStartPre=/bin/rm -f /run/openvswitch.useropts + +-ExecStartPre=-/usr/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch +-ExecStartPre=/bin/sh -c '/usr/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' -ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' -+ExecStartPre=-/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch -+ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch.useropts; /bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' ++ExecStartPre=-/bin/chown ${OVS_USER_ID} /run/openvswitch /var/log/openvswitch ++ExecStartPre=/bin/sh -c '/bin/echo "OVS_USER_ID=${OVS_USER_ID}" > /run/openvswitch.useropts' +ExecStartPre=/bin/sh -c 'if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /bin/echo "OVS_USER_OPT=--ovs-user=${OVS_USER_ID}" >> /run/openvswitch.useropts; fi' - EnvironmentFile=-/run/openvswitch.useropts ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovs-vswitchd --no-monitor --system-id=random \ --- -2.7.4 - + ${OVS_USER_OPT} \ diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc index 37fbe5ab..767a41e6 100644 --- a/recipes-networking/openvswitch/openvswitch.inc +++ b/recipes-networking/openvswitch/openvswitch.inc @@ -9,22 +9,22 @@ DESCRIPTION = "\ HOMEPAGE = "http://openvswitch.org/" SECTION = "networking" -LICENSE = "Apache-2" +LICENSE = "Apache-2.0" DEPENDS += "bridge-utils openssl python3 perl python3-six-native coreutils-native" -RDEPENDS_${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ +RDEPENDS:${PN} += "util-linux-uuidgen util-linux-libuuid coreutils \ python3 perl perl-module-strict ${PN}-switch \ bash python3-twisted python3-six" -RDEPENDS_${PN}-testcontroller = "${PN} ${PN}-pki" -RDEPENDS_${PN}-switch = "${PN} openssl procps util-linux-uuidgen" -RDEPENDS_${PN}-pki = "${PN}" -RDEPENDS_${PN}-brcompat = "${PN} ${PN}-switch" +RDEPENDS:${PN}-testcontroller = "${PN} ${PN}-pki" +RDEPENDS:${PN}-switch = "${PN} openssl procps util-linux-uuidgen" +RDEPENDS:${PN}-pki = "${PN}" +RDEPENDS:${PN}-brcompat = "${PN} ${PN}-switch" # Some installers will fail because of an install order based on # rdeps. E.g. ovs-pki calls sed in the postinstall. sed may be # queued for install later. -RDEPENDS_${PN} += "sed gawk grep" +RDEPENDS:${PN} += "sed gawk grep" SRC_URI = "\ file://openvswitch-switch \ @@ -45,19 +45,19 @@ CONFIGUREOPT_DEPTRACK = "" # distro layers can enable with EXTRA_OECONF_pn_openvswitch += "" # EXTRA_OECONF = "--with-linux=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" -ALLOW_EMPTY_${PN}-pki = "1" +ALLOW_EMPTY:${PN}-pki = "1" PACKAGES =+ "${PN}-testcontroller ${PN}-switch ${PN}-brcompat ${PN}-pki" -FILES_${PN}-testcontroller = "\ +FILES:${PN}-testcontroller = "\ ${sysconfdir}/init.d/openvswitch-testcontroller \ ${sysconfdir}/default/openvswitch-testcontroller \ ${sysconfdir}/openvswitch-testcontroller \ ${bindir}/ovs-testcontroller \ " -FILES_${PN}-brcompat = "${sbindir}/ovs-brcompatd" +FILES:${PN}-brcompat = "${sbindir}/ovs-brcompatd" -FILES_${PN}-switch = "\ +FILES:${PN}-switch = "\ ${sysconfdir}/init.d/openvswitch-switch \ ${sysconfdir}/default/openvswitch-switch \ ${systemd_unitdir}/system/ovs-vswitchd.service \ @@ -68,33 +68,33 @@ FILES_${PN}-switch = "\ " # silence a warning -FILES_${PN} += "${datadir}/ovsdbmonitor" -FILES_${PN} += "/run" +FILES:${PN} += "${datadir}/ovsdbmonitor" +FILES:${PN} += "/run" -FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" -inherit autotools update-rc.d systemd python3native +FILES:${PN} += "${libdir}/python${PYTHON_BASEVERSION}/" +inherit pkgconfig autotools update-rc.d systemd python3native SYSTEMD_PACKAGES = "${PN}-switch" -SYSTEMD_SERVICE_${PN}-switch = " \ +SYSTEMD_SERVICE:${PN}-switch = " \ ovsdb-server.service \ ovs-vswitchd.service \ openvswitch.service \ " INITSCRIPT_PACKAGES = "${PN}-switch ${PN}-testcontroller" -INITSCRIPT_NAME_${PN}-switch = "openvswitch-switch" -INITSCRIPT_PARAMS_${PN}-switch = "defaults 71" +INITSCRIPT_NAME:${PN}-switch = "openvswitch-switch" +INITSCRIPT_PARAMS:${PN}-switch = "defaults 71" -INITSCRIPT_NAME_${PN}-testcontroller = "openvswitch-testcontroller" -INITSCRIPT_PARAMS_${PN}-testcontroller = "defaults 72" +INITSCRIPT_NAME:${PN}-testcontroller = "openvswitch-testcontroller" +INITSCRIPT_PARAMS:${PN}-testcontroller = "defaults 72" -do_configure_prepend() { +do_configure:prepend() { # Work around the for Makefile CC=$(if ....) by swapping out any # "-Wa," assembly directives with "-Xassembler CC=`echo '${CC}' | sed 's/-Wa,/-Xassembler /g'` } -do_install_prepend() { +do_install:prepend() { SERVICE_FILE="${S}/rhel/usr_lib_systemd_system_ovs-vswitchd.service" ${S}/build-aux/dpdkstrip.py \ ${@bb.utils.contains('PACKAGECONFIG','dpdk','--dpdk','--nodpdk',d)} \ @@ -102,7 +102,7 @@ do_install_prepend() { > ${SERVICE_FILE} } -do_install_append() { +do_install:append() { install -d ${D}/${sysconfdir}/default/ install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch install -d ${D}/${sysconfdir}/openvswitch-testcontroller @@ -132,18 +132,17 @@ do_install_append() { install -d ${D}/usr/share/openvswitch/scripts/ install -m 755 ${S}/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload ${D}/usr/share/openvswitch/scripts/ovs-systemd-reload - oe_runmake modules_install INSTALL_MOD_PATH=${D} install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/ } -pkg_postinst_ontarget_${PN}-pki () { +pkg_postinst_ontarget:${PN}-pki () { if test ! -d $D/${datadir}/${PN}/pki; then ovs-pki init --dir=$D/${datadir}/${PN}/pki fi } -pkg_postinst_ontarget_${PN}-testcontroller () { +pkg_postinst_ontarget:${PN}-testcontroller () { if test ! -d $D/${datadir}/${PN}/pki; then ovs-pki init --dir=$D/${datadir}/${PN}/pki fi diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb index 07258be7..b7d9b8dd 100644 --- a/recipes-networking/openvswitch/openvswitch_git.bb +++ b/recipes-networking/openvswitch/openvswitch_git.bb @@ -4,7 +4,7 @@ DEPENDS += "virtual/kernel" PACKAGE_ARCH = "${MACHINE_ARCH}" -RDEPENDS_${PN}-ptest += "\ +RDEPENDS:${PN}-ptest += "\ python3-logging python3-syslog python3-io python3-core \ python3-fcntl python3-shell python3-xml python3-math \ python3-datetime python3-netclient python3 sed \ @@ -14,31 +14,25 @@ RDEPENDS_${PN}-ptest += "\ " S = "${WORKDIR}/git" -PV = "2.13+${SRCPV}" - -FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:" - -SRCREV = "71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3" -SRC_URI = "file://openvswitch-switch \ - file://openvswitch-switch-setup \ - file://openvswitch-testcontroller \ - file://openvswitch-testcontroller-setup \ - git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.13 \ - file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ - file://run-ptest \ - file://disable_m4_check.patch \ - file://kernel_module.patch \ - file://python-switch-remaining-scripts-to-use-python3.patch \ - file://systemd-update-tool-paths.patch \ - file://systemd-create-runtime-dirs.patch \ +PV = "3.3.0" +CVE_VERSION = "3.3.0" + +FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:" + +SRCREV = "1c1f173ce8a8534e262083bc4db3ee15f05231c0" +SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.3 \ + file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ + file://run-ptest \ + file://disable_m4_check.patch \ + file://systemd-update-tool-paths.patch \ + file://systemd-create-runtime-dirs.patch \ + file://Makefile.am-set-the-python3-interpreter-with-usr-bin.patch \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=1ce5d23a6429dff345518758f13aaeab" -DPDK_INSTALL_DIR ?= "/opt/dpdk" - PACKAGECONFIG ?= "libcap-ng" -PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}${DPDK_INSTALL_DIR}/share/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk,dpdk" +PACKAGECONFIG[dpdk] = "--with-dpdk=shared,,dpdk,dpdk" PACKAGECONFIG[libcap-ng] = "--enable-libcapng,--disable-libcapng,libcap-ng," PACKAGECONFIG[ssl] = ",--disable-ssl,openssl," @@ -48,7 +42,7 @@ PACKAGECONFIG[ssl] = ",--disable-ssl,openssl," # EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_BUILDDIR} --with-linux-source=${STAGING_KERNEL_DIR} KARCH=${TARGET_ARCH}" # silence a warning -FILES_${PN} += "/lib/modules" +FILES:${PN} += "/lib/modules" inherit ptest @@ -58,6 +52,3 @@ do_install_ptest() { oe_runmake test-install } -do_install_append() { - oe_runmake modules_install INSTALL_MOD_PATH=${D} -} diff --git a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb b/recipes-networking/slirp4netns/slirp4netns_git.bb index b47df968..33a5636a 100644 --- a/recipes-networking/slirp4netns/slirp4netns_0.4.1.bb +++ b/recipes-networking/slirp4netns/slirp4netns_git.bb @@ -3,14 +3,21 @@ DESCRIPTION = "slirp4netns allows connecting a network namespace to the \ Internet in a completely unprivileged way, by connecting a TAP device in a \ network namespace to the usermode TCP/IP stack ("slirp")." -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=1e2efd29c201480c6be2744d9edade26" -SRCREV = "4d38845e2e311b684fc8d1c775c725bfcd5ddc27" -SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1" +SRCREV = "323aa69a68362a432f15d5e8050e74a0637aaf1e" +SRC_URI = "git://github.com/rootless-containers/slirp4netns.git;nobranch=1;protocol=https" -DEPENDS = "glib-2.0 libcap libseccomp" +PV = "1.2.0+git" + +inherit features_check +REQUIRED_DISTRO_FEATURES ?= "seccomp" + +DEPENDS = "glib-2.0 libcap libseccomp libslirp" S = "${WORKDIR}/git" +RRECOMMENDS:${PN} += "kernel-module-tun" + inherit autotools pkgconfig |