From d33639adddae5fdfaf45d1ac80ebc61829c71d00 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: May 12 2021 19:14:51 +0000 Subject: Import openvswitch2.13-2.13.0-110 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 6adc863..ca73b57 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -1,6 +1,6 @@ diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh new file mode 100755 -index 0000000000..c1cf85d7d9 +index 0000000000..b22ad95310 --- /dev/null +++ b/.ci/linux-build.sh @@ -0,0 +1,244 @@ @@ -188,7 +188,7 @@ index 0000000000..c1cf85d7d9 + +if [ "$DPDK" ] || [ "$DPDK_SHARED" ]; then + if [ -z "$DPDK_VER" ]; then -+ DPDK_VER="19.11.6" ++ DPDK_VER="19.11.8" + fi + install_dpdk $DPDK_VER + # Enable pdump support in OVS. @@ -649,7 +649,7 @@ index 22976a3cd6..f46ec988a3 100644 else install-man-rst: diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst -index 6702c58a2b..4a0dcac495 100644 +index 6702c58a2b..70a0e9b221 100644 --- a/Documentation/faq/releases.rst +++ b/Documentation/faq/releases.rst @@ -67,9 +67,10 @@ Q: What Linux kernel versions does each Open vSwitch release work with? @@ -702,7 +702,7 @@ index 6702c58a2b..4a0dcac495 100644 + 2.10.x 17.11.10 + 2.11.x 18.11.11 + 2.12.x 18.11.11 -+ 2.13.x 19.11.6 ++ 2.13.x 19.11.8 + ============ ======== Q: Are all the DPDK releases that OVS versions work with maintained? @@ -727,7 +727,7 @@ index 5a314cc60a..f2039595e7 100644 Email Subject ------------- diff --git a/Documentation/intro/install/dpdk.rst b/Documentation/intro/install/dpdk.rst -index dbf88ec43f..050e5544b3 100644 +index dbf88ec43f..b603b6f0b0 100644 --- a/Documentation/intro/install/dpdk.rst +++ b/Documentation/intro/install/dpdk.rst @@ -42,7 +42,7 @@ Build requirements @@ -735,7 +735,7 @@ index dbf88ec43f..050e5544b3 100644 vSwitch with DPDK will require the following: -- DPDK 19.11 -+- DPDK 19.11.6 ++- DPDK 19.11.8 - A `DPDK supported NIC`_ @@ -746,9 +746,9 @@ index dbf88ec43f..050e5544b3 100644 - $ wget https://fast.dpdk.org/rel/dpdk-19.11.tar.xz - $ tar xf dpdk-19.11.tar.xz - $ export DPDK_DIR=/usr/src/dpdk-19.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-19.11.6.tar.xz -+ $ tar xf dpdk-19.11.6.tar.xz -+ $ export DPDK_DIR=/usr/src/dpdk-stable-19.11.6 ++ $ wget https://fast.dpdk.org/rel/dpdk-19.11.8.tar.xz ++ $ tar xf dpdk-19.11.8.tar.xz ++ $ export DPDK_DIR=/usr/src/dpdk-stable-19.11.8 $ cd $DPDK_DIR #. (Optional) Configure DPDK as a shared library @@ -832,7 +832,7 @@ index 103495415a..a98ec672fc 100644 This configuration accomplishes that the high priority traffic has a guaranteed bandwidth egressing the ports at CIR (1000pps), but it can also diff --git a/Documentation/topics/dpdk/vhost-user.rst b/Documentation/topics/dpdk/vhost-user.rst -index c6c6fd8bde..d0201151a0 100644 +index c6c6fd8bde..b10daa53e3 100644 --- a/Documentation/topics/dpdk/vhost-user.rst +++ b/Documentation/topics/dpdk/vhost-user.rst @@ -392,9 +392,9 @@ To begin, instantiate a guest as described in :ref:`dpdk-vhost-user` or @@ -842,9 +842,9 @@ index c6c6fd8bde..d0201151a0 100644 - $ wget https://fast.dpdk.org/rel/dpdk-19.11.tar.xz - $ tar xf dpdk-19.11.tar.xz - $ export DPDK_DIR=/root/dpdk/dpdk-19.11 -+ $ wget https://fast.dpdk.org/rel/dpdk-19.11.6.tar.xz -+ $ tar xf dpdk-19.11.6.tar.xz -+ $ export DPDK_DIR=/root/dpdk/dpdk-stable-19.11.6 ++ $ wget https://fast.dpdk.org/rel/dpdk-19.11.8.tar.xz ++ $ tar xf dpdk-19.11.8.tar.xz ++ $ export DPDK_DIR=/root/dpdk/dpdk-stable-19.11.8 $ export DPDK_TARGET=x86_64-native-linuxapp-gcc $ export DPDK_BUILD=$DPDK_DIR/$DPDK_TARGET $ cd $DPDK_DIR @@ -987,14 +987,14 @@ index b279303d18..b3b56cd50e 100644 boot.sh \ poc/builders/Vagrantfile \ diff --git a/NEWS b/NEWS -index dab94e924d..32ec919d13 100644 +index dab94e924d..733c785f06 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,49 @@ +v2.13.4 - xx xxx xxxx +--------------------- + - DPDK: -+ * OVS validated with DPDK 19.11.6. It is recommended to use this version ++ * OVS validated with DPDK 19.11.8. It is recommended to use this version + until further releases. + - ovs-ctl: + * New option '--no-record-hostname' to disable hostname configuration diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index d0cbf2b..b40cf56 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 109%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 110%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -710,6 +710,10 @@ exit 0 %endif %changelog +* Wed May 12 2021 Open vSwitch CI - 2.13.0-110 +- Merging upstream branch-2.13 + [6022570f3ffe9e519fde26fdd8d52c175962f253] + * Tue May 11 2021 Open vSwitch CI - 2.13.0-109 - Merging upstream branch-2.13 [132c26ba2023095d0b74cc5f63a808b10ddfbe65]