diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 05eb43a..b6e3081 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -21,7 +21,7 @@ index 3e5136fd4e..ed5fbbb05b 100755 # 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..7f33680b40 100755 +index 69a40011f4..7bf3cd46a4 100755 --- a/.ci/linux-prepare.sh +++ b/.ci/linux-prepare.sh @@ -21,8 +21,7 @@ make -j4 HAVE_LLVM= HAVE_SQLITE= install @@ -30,7 +30,7 @@ index 69a40011f4..7f33680b40 100755 pip3 install --disable-pip-version-check --user flake8 hacking -pip3 install --user --upgrade docutils -pip3 install --user 'meson==0.47.1' -+pip3 install --user 'meson==0.48.1' ++pip3 install --user 'meson==0.53.2' if [ "$M32" ]; then # Installing 32-bit libraries. diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index f637373..15d99de 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: 127%{?dist} +Release: 128%{?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 +* Sat Nov 05 2022 Open vSwitch CI - 2.15.0-128 +- Merging upstream branch-2.15 [RH git: bd14504e2d] + Commit list: + 41d86c94fa ci: Update meson requirement for DPDK. + + * Wed Nov 02 2022 Open vSwitch CI - 2.15.0-127 - Merging upstream branch-2.15 [RH git: 96456c53d4] Commit list: