diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index fa0da62..8254bed 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -1,5 +1,5 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh -index 3e5136fd4e..1acf5012db 100755 +index 3e5136fd4e..ea51dec8ee 100755 --- a/.ci/linux-build.sh +++ b/.ci/linux-build.sh @@ -201,7 +201,7 @@ fi @@ -7,7 +7,7 @@ index 3e5136fd4e..1acf5012db 100755 if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then if [ -z "$DPDK_VER" ]; then - DPDK_VER="20.11" -+ DPDK_VER="20.11.1" ++ DPDK_VER="20.11.4" fi install_dpdk $DPDK_VER if [ "$CC" = "clang" ]; then @@ -105,7 +105,7 @@ index ea3475f356..2b0ad9554f 100644 else install-man-rst: diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index 6a5e4141f1..0fd1c2c398 100644 +index 6a5e4141f1..4c8b97de65 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -204,9 +204,9 @@ Q: What DPDK version does each Open vSwitch release work with? @@ -117,12 +117,12 @@ index 6a5e4141f1..0fd1c2c398 100644 - 2.15.x 20.11.0 + 2.13.x 19.11.10 + 2.14.x 19.11.10 -+ 2.15.x 20.11.1 ++ 2.15.x 20.11.4 ============ ======== 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 3a24e54f97..20c148f5eb 100644 +index 3a24e54f97..f5edfa756b 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -130,7 +130,7 @@ index 3a24e54f97..20c148f5eb 100644 vSwitch with DPDK will require the following: -- DPDK 20.11 -+- DPDK 20.11.1 ++- DPDK 20.11.4 - A `DPDK supported NIC`_ @@ -141,9 +141,9 @@ index 3a24e54f97..20c148f5eb 100644 - $ wget https://fast.dpdk.org/rel/dpdk-20.11.tar.xz - $ tar xf dpdk-20.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-20.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-20.11.1.tar.xz -+ $ tar xf dpdk-20.11.1.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-20.11.1 ++ $ wget https://fast.dpdk.org/rel/dpdk-20.11.4.tar.xz ++ $ tar xf dpdk-20.11.4.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-20.11.4 $ cd $DPDK_DIR #. Configure and install DPDK using Meson @@ -631,12 +631,15 @@ index 0000000000..cdded4f906 +.. _bcc : https://github.com/iovisor/bcc +.. _Trace Compass : https://www.eclipse.org/tracecompass/ diff --git a/NEWS b/NEWS -index bc901efdb1..d491703571 100644 +index bc901efdb1..d51b7f9ce9 100644 --- a/NEWS +++ b/NEWS -@@ -1,3 +1,34 @@ +@@ -1,3 +1,37 @@ +v2.15.4 - xx xxx xxxx +--------------------- ++ - DPDK: ++ * OVS validated with DPDK 20.11.4. It is recommended to use this version ++ until further releases. + +v2.15.3 - 17 Dec 2021 +--------------------- diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 074b120..e9e2076 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 82%{?dist} +Release: 83%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,12 @@ exit 0 %endif %changelog +* Mon Mar 14 2022 Open vSwitch CI - 2.15.0-83 +- Merging upstream branch-2.15 [RH git: d2abb6b2f3] + Commit list: + 45e10d84d7 dpdk: Use DPDK 20.11.4 release + + * Fri Mar 11 2022 Open vSwitch CI - 2.15.0-82 - Merging upstream branch-2.15 [RH git: 7bb43bfb9f] Commit list: