From 3c3ba443b363d4fe4beab044bd63bc0fb17821e7 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Oct 27 2021 13:19:07 +0000 Subject: Import openvswitch2.13-2.13.0-135 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 8e46a0c..3e1249f 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -250,10 +250,10 @@ index 0000000000..b22ad95310 +exit 0 diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh new file mode 100755 -index 0000000000..fea905a830 +index 0000000000..ebc7c12127 --- /dev/null +++ b/.ci/linux-prepare.sh -@@ -0,0 +1,42 @@ +@@ -0,0 +1,41 @@ +#!/bin/bash + +set -ev @@ -277,7 +277,6 @@ index 0000000000..fea905a830 +cd .. + +pip3 install --disable-pip-version-check --user flake8 hacking -+pip3 install --user --upgrade docutils + +if [ "$M32" ]; then + # Installing 32-bit libraries. diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index d9c5f51..7367d39 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: 134%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 135%{?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 @@ -712,6 +712,12 @@ exit 0 %endif %changelog +* Wed Oct 27 2021 Open vSwitch CI - 2.13.0-135 +- Merging upstream branch-2.13 [RH git: 1b6734e549] + Commit list: + b73ad3bcf7 ci: Make linux-prepare trust system installs. + + * Fri Oct 22 2021 Open vSwitch CI - 2.13.0-134 - Merging upstream branch-2.13 [RH git: c72ff28f03] Commit list: