diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 8d578fc..50e78af 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -20,6 +20,18 @@ index 3e5136fd4e..1acf5012db 100755 TESTSUITEFLAGS=-j4 RECHECK=yes; then # testsuite.log is necessary for debugging. cat */_build/sub/tests/testsuite.log +diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh +index 69a40011f4..0152168794 100755 +--- a/.ci/linux-prepare.sh ++++ b/.ci/linux-prepare.sh +@@ -21,7 +21,6 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install + cd .. + + pip3 install --disable-pip-version-check --user flake8 hacking +-pip3 install --user --upgrade docutils + pip3 install --user 'meson==0.47.1' + + if [ "$M32" ]; then diff --git a/.cirrus.yml b/.cirrus.yml index 2caf36b85c..480fea2421 100644 --- a/.cirrus.yml diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index ec02b54..e60a61d 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: 48%{?dist} +Release: 49%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Wed Oct 27 2021 Open vSwitch CI - 2.15.0-49 +- Merging upstream branch-2.15 [RH git: 2502ca29b0] + Commit list: + 952e851506 ci: Make linux-prepare trust system installs. + + * Mon Oct 25 2021 Open vSwitch CI - 2.15.0-48 - Merging upstream branch-2.15 [RH git: 7cf784736e] Commit list: