diff --git a/SOURCES/openvswitch-3.3.0.patch b/SOURCES/openvswitch-3.3.0.patch index 648b28e..2085c61 100644 --- a/SOURCES/openvswitch-3.3.0.patch +++ b/SOURCES/openvswitch-3.3.0.patch @@ -69,7 +69,7 @@ index d8a9722809..9f0fbfe40d 100644 matrix: COMPILER: gcc diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index fc75581486..e75cb54d58 100644 +index fc75581486..bbd422d068 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,17 +2,23 @@ name: Build and Test @@ -91,7 +91,7 @@ index fc75581486..e75cb54d58 100644 - DPDK_GIT: https://dpdk.org/git/dpdk - DPDK_VER: 23.11 + DPDK_GIT: https://dpdk.org/git/dpdk-stable -+ DPDK_VER: 23.11.2 ++ DPDK_VER: 23.11.3 name: dpdk gcc outputs: dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} @@ -411,7 +411,7 @@ index 085ca2cd67..774eafdb76 100644 # -- Options for manual page output --------------------------------------- diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index 49b987b610..13cc635d04 100644 +index 49b987b610..027b281623 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -216,11 +216,11 @@ Q: What DPDK version does each Open vSwitch release work with? @@ -423,16 +423,16 @@ index 49b987b610..13cc635d04 100644 - 3.1.x 22.11.4 - 3.2.x 22.11.4 - 3.3.x 23.11 -+ 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 ++ 2.17.x 21.11.9 ++ 3.0.x 21.11.9 ++ 3.1.x 22.11.7 ++ 3.2.x 22.11.7 ++ 3.3.x 23.11.3 ============ ======== 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 ad9bdf22c0..e22b5676df 100644 +index ad9bdf22c0..033c507b10 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -440,7 +440,7 @@ index ad9bdf22c0..e22b5676df 100644 vSwitch with DPDK will require the following: -- DPDK 23.11 -+- DPDK 23.11.2 ++- DPDK 23.11.3 - A `DPDK supported NIC`_ @@ -451,9 +451,9 @@ index ad9bdf22c0..e22b5676df 100644 - $ wget https://fast.dpdk.org/rel/dpdk-23.11.tar.xz - $ tar xf dpdk-23.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-23.11 -+ $ 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 ++ $ wget https://fast.dpdk.org/rel/dpdk-23.11.3.tar.xz ++ $ tar xf dpdk-23.11.3.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-23.11.3 $ cd $DPDK_DIR #. Configure and install DPDK using Meson @@ -814,10 +814,10 @@ index 94f488d183..23c3417a70 100644 touch $@ endif diff --git a/NEWS b/NEWS -index 8888fb3ec5..f60881f804 100644 +index 8888fb3ec5..55643a5bc7 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,32 @@ +@@ -1,3 +1,34 @@ +v3.3.4 - xx xxx xxxx +-------------------- + - The limit on the number of fields for address prefix tracking in flow @@ -828,6 +828,8 @@ index 8888fb3ec5..f60881f804 100644 + name=table123 prefixes=nw_dst,nw_src,ipv6_dst,ipv6_src + This allows to significantly reduce amount of datapath flows generated + from mixed IPv4+IPv6 flow tables, if configured. ++ - DPDK: ++ * OVS validated with DPDK 23.11.3. + +v3.3.3 - 15 Nov 2024 +-------------------- diff --git a/SPECS/openvswitch3.3.spec b/SPECS/openvswitch3.3.spec index 173f5e5..1814a8e 100644 --- a/SPECS/openvswitch3.3.spec +++ b/SPECS/openvswitch3.3.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.3.0 -Release: 32%{?dist} +Release: 33%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -769,6 +769,12 @@ exit 0 %endif %changelog +* Fri Jan 24 2025 Open vSwitch CI - 3.3.0-33 +- Merging upstream branch-3.3 [RH git: 83b78a542c] + Commit list: + a8d11acb05 dpdk: Use DPDK 23.11.3 release for OVS 3.3. + + * Thu Jan 23 2025 Open vSwitch CI - 3.3.0-32 - Merging upstream branch-3.3 [RH git: 717cfa2d7a] Commit list: