diff --git a/SOURCES/openvswitch-3.2.0.patch b/SOURCES/openvswitch-3.2.0.patch index 1efb619..bc6eff2 100644 --- a/SOURCES/openvswitch-3.2.0.patch +++ b/SOURCES/openvswitch-3.2.0.patch @@ -52,7 +52,7 @@ index 48931fa085..8db385f002 100644 memory: 4G diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml -index 47d239f108..565058cec6 100644 +index 47d239f108..951e7e3217 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -2,22 +2,25 @@ name: Build and Test @@ -69,7 +69,7 @@ index 47d239f108..565058cec6 100644 CC: gcc DPDK_GIT: https://dpdk.org/git/dpdk-stable - DPDK_VER: 22.11.1 -+ DPDK_VER: 22.11.4 ++ DPDK_VER: 22.11.5 name: dpdk gcc outputs: dpdk_key: ${{ steps.gen_dpdk_key.outputs.key }} @@ -308,7 +308,7 @@ index 9186e1ad22..f58bf1c853 100644 DK Moon Ding Zhi zhi.ding@6wind.com diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index e6bda14e7b..f47d408369 100644 +index e6bda14e7b..2be9b501c2 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -215,10 +215,10 @@ Q: What DPDK version does each Open vSwitch release work with? @@ -319,15 +319,15 @@ index e6bda14e7b..f47d408369 100644 - 3.0.x 21.11.2 - 3.1.x 22.11.1 - 3.2.x 22.11.1 -+ 2.17.x 21.11.6 -+ 3.0.x 21.11.6 -+ 3.1.x 22.11.4 -+ 3.2.x 22.11.4 ++ 2.17.x 21.11.7 ++ 3.0.x 21.11.7 ++ 3.1.x 22.11.5 ++ 3.2.x 22.11.5 ============ ======== 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 63a0ebb23b..27df48493e 100644 +index 63a0ebb23b..a9921ae426 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -335,7 +335,7 @@ index 63a0ebb23b..27df48493e 100644 vSwitch with DPDK will require the following: -- DPDK 22.11.1 -+- DPDK 22.11.4 ++- DPDK 22.11.5 - A `DPDK supported NIC`_ @@ -346,9 +346,9 @@ index 63a0ebb23b..27df48493e 100644 - $ wget https://fast.dpdk.org/rel/dpdk-22.11.1.tar.xz - $ tar xf dpdk-22.11.1.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.1 -+ $ wget https://fast.dpdk.org/rel/dpdk-22.11.4.tar.xz -+ $ tar xf dpdk-22.11.4.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.4 ++ $ wget https://fast.dpdk.org/rel/dpdk-22.11.5.tar.xz ++ $ tar xf dpdk-22.11.5.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-22.11.5 $ cd $DPDK_DIR #. Configure and install DPDK using Meson @@ -450,12 +450,14 @@ index db341504d3..0b7c832469 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index a3a5c2e4a2..baeecae046 100644 +index a3a5c2e4a2..8baf3d2aad 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,18 @@ +@@ -1,3 +1,20 @@ +v3.2.3 - xx xxx xxxx +-------------------- ++ - DPDK: ++ * OVS validated with DPDK 22.11.5. + +v3.2.2 - 08 Feb 2024 +-------------------- diff --git a/SPECS/openvswitch3.2.spec b/SPECS/openvswitch3.2.spec index 9356c32..31ad244 100644 --- a/SPECS/openvswitch3.2.spec +++ b/SPECS/openvswitch3.2.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.2.0 -Release: 81%{?dist} +Release: 82%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -761,6 +761,12 @@ exit 0 %endif %changelog +* Thu May 30 2024 Open vSwitch CI - 3.2.0-82 +- Merging upstream branch-3.2 [RH git: 78ade43d4a] + Commit list: + f42c407ff7 dpdk: Use DPDK 22.11.5 release for OVS 3.2. + + * Tue May 28 2024 Open vSwitch CI - 3.2.0-81 - Merging upstream branch-3.2 [RH git: 11e849f164] Commit list: