diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index fa4f0ca..0810fce 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -1,5 +1,5 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh -index 6cd38ff3ef..2e1bf25881 100755 +index 6cd38ff3ef..0f5263709a 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -220,11 +220,15 @@ fi @@ -7,7 +7,7 @@ index 6cd38ff3ef..2e1bf25881 100755 if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then if [ -z "$DPDK_VER" ]; then - DPDK_VER="21.11" -+ DPDK_VER="21.11.6" ++ DPDK_VER="21.11.7" fi install_dpdk $DPDK_VER fi @@ -272,7 +272,7 @@ index 6d11c9c4f3..1ce4e9dd35 100644 DK Moon Ding Zhi zhi.ding@6wind.com diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index af524251ff..a9045a2d56 100644 +index af524251ff..1e896add52 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -32,7 +32,7 @@ Q: What does it mean for an Open vSwitch release to be LTS (long-term support)? @@ -297,7 +297,7 @@ index af524251ff..a9045a2d56 100644 + 2.14.x 19.11.13 + 2.15.x 20.11.6 + 2.16.x 20.11.6 -+ 2.17.x 21.11.6 ++ 2.17.x 21.11.7 ============ ======== Q: Are all the DPDK releases that OVS versions work with maintained? @@ -315,7 +315,7 @@ index 172d684df9..0203bbe955 100644 +.. |grant-revocation| replace:: :doc:`committer-grant-revocation` +.. |emeritus-status| replace:: :doc:`committer-emeritus-status` diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst -index d9f44055db..fff49007e9 100644 +index d9f44055db..3d011ecb3f 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -323,7 +323,7 @@ index d9f44055db..fff49007e9 100644 vSwitch with DPDK will require the following: -- DPDK 21.11 -+- DPDK 21.11.6 ++- DPDK 21.11.7 - A `DPDK supported NIC`_ @@ -334,9 +334,9 @@ index d9f44055db..fff49007e9 100644 - $ wget https://fast.dpdk.org/rel/dpdk-21.11.tar.xz - $ tar xf dpdk-21.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-21.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-21.11.6.tar.xz -+ $ tar xf dpdk-21.11.6.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-21.11.6 ++ $ wget https://fast.dpdk.org/rel/dpdk-21.11.7.tar.xz ++ $ tar xf dpdk-21.11.7.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-21.11.7 $ cd $DPDK_DIR #. Configure and install DPDK using Meson @@ -528,12 +528,14 @@ index cb8076433e..70c9c62b13 100644 @if cmp -s $(@F).tmp $@; then \ touch $@; \ diff --git a/NEWS b/NEWS -index c10e9bfacc..ca111ae3a3 100644 +index c10e9bfacc..e91072dd6b 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,91 @@ +@@ -1,3 +1,93 @@ +v2.17.10 - xx xxx xxxx +---------------------- ++ - DPDK: ++ * OVS validated with DPDK 21.11.7. + +v2.17.9 - 08 Feb 2024 +--------------------- diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 91102e3..0d034a4 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 171%{?dist} +Release: 172%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Thu May 30 2024 Open vSwitch CI - 2.17.0-172 +- Merging upstream branch-2.17 [RH git: 76bb1d3eb3] + Commit list: + 628ccf2c67 dpdk: Use DPDK 21.11.7 release for OVS 2.17. + + * Tue May 28 2024 Open vSwitch CI - 2.17.0-171 - Merging upstream branch-2.17 [RH git: ab94259ae7] Commit list: