diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index 155d2a2..797536a 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -11,6 +11,68 @@ index 2a191b57fb..5f8a1db6af 100755 # Install python test dependencies pip3 install -r python/test_requirements.txt +diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml +index 9d3a13ca1c..022c4cd31d 100644 +--- a/.github/workflows/build-and-test.yml ++++ b/.github/workflows/build-and-test.yml +@@ -11,7 +11,7 @@ jobs: + dependencies: gcc libbpf-dev libnuma-dev libpcap-dev ninja-build pkgconf + CC: gcc + DPDK_GIT: https://dpdk.org/git/dpdk-stable +- DPDK_VER: 23.11.1 ++ DPDK_VER: 23.11.2 + name: dpdk gcc + outputs: + dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} +diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst +index 7c32d7acfc..d345b63d5b 100644 +--- a/Documentation/faq/releases.rst ++++ b/Documentation/faq/releases.rst +@@ -216,12 +216,12 @@ Q: What DPDK version does each Open vSwitch release work with? + 2.14.x 19.11.13 + 2.15.x 20.11.6 + 2.16.x 20.11.6 +- 2.17.x 21.11.7 +- 3.0.x 21.11.7 +- 3.1.x 22.11.5 +- 3.2.x 22.11.5 +- 3.3.x 23.11.1 +- 3.4.x 23.11.1 ++ 2.17.x 21.11.8 ++ 3.0.x 21.11.8 ++ 3.1.x 22.11.6 ++ 3.2.x 22.11.6 ++ 3.3.x 23.11.2 ++ 3.4.x 23.11.2 + ============ ======== + + Q: Are all the DPDK releases that OVS versions work with maintained? +diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst +index 63a978f0e8..ebd29a45a9 100644 +--- a/Documentation/intro/install/dpdk.rst ++++ b/Documentation/intro/install/dpdk.rst +@@ -42,7 +42,7 @@ Build requirements + In addition to the requirements described in :doc:`general`, building Open + vSwitch with DPDK will require the following: + +-- DPDK 23.11.1 ++- DPDK 23.11.2 + + - A `DPDK supported NIC`_ + +@@ -73,9 +73,9 @@ Install DPDK + #. Download the `DPDK sources`_, extract the file and set ``DPDK_DIR``:: + + $ cd /usr/src/ +- $ wget https://fast.dpdk.org/rel/dpdk-23.11.1.tar.xz +- $ tar xf dpdk-23.11.1.tar.xz +- $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.1 ++ $ wget https://fast.dpdk.org/rel/dpdk-23.11.2.tar.xz ++ $ tar xf dpdk-23.11.2.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.2 + $ cd $DPDK_DIR + + #. Configure and install DPDK using Meson diff --git a/Documentation/ref/ovs-appctl.8.rst b/Documentation/ref/ovs-appctl.8.rst index 7054cf559e..e7c8b96d49 100644 --- a/Documentation/ref/ovs-appctl.8.rst @@ -212,12 +274,14 @@ index 7054cf559e..e7c8b96d49 100644 ``lpr``, ``news``, ``uucp``, ``clock``, ``ftp``, ``ntp``, ``audit``, ``alert``, ``clock2``, ``local0``, ``local1``, ``local2``, diff --git a/NEWS b/NEWS -index 944c95a8d7..5a1010d931 100644 +index 944c95a8d7..faa159cbb6 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,6 @@ +@@ -1,3 +1,8 @@ +v3.4.1 - xx xxx xxxx +-------------------- ++ - DPDK: ++ * OVS validated with DPDK 23.11.2. + v3.4.0 - 15 Aug 2024 -------------------- diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index 7c3fd08..181d40a 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 10%{?dist} +Release: 11%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,12 @@ exit 0 %endif %changelog +* Wed Oct 23 2024 Open vSwitch CI - 3.4.0-11 +- Merging upstream branch-3.4 [RH git: c1a17e3dc6] + Commit list: + 7e0f702fd3 dpdk: Use DPDK 23.11.2 release for OVS 3.4. + + * Wed Oct 23 2024 Timothy Redaelli - 3.4.0-10 - Add OVS_SHA_REF to correctly point to v3.4.0 commit [RH git: 69a101f196] This is needed since the current starting commit includes also