diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index 8430547..28d60ec 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -22,6 +22,19 @@ index 6cd38ff3ef..392c7ee79c 100755 CFLAGS_FOR_OVS="${CFLAGS_FOR_OVS} ${CFLAGS_ASAN}" fi +diff --git a/.ci/linux-prepare.sh b/.ci/linux-prepare.sh +index 1fe890846e..321b9bf86e 100755 +--- a/.ci/linux-prepare.sh ++++ b/.ci/linux-prepare.sh +@@ -27,7 +27,7 @@ cd .. + pip3 install --disable-pip-version-check --user wheel + pip3 install --disable-pip-version-check --user \ + flake8 'hacking>=3.0' sphinx setuptools pyelftools +-pip3 install --user 'meson==0.49.2' ++pip3 install --user 'meson==0.53.2' + + if [ "$M32" ]; then + # Installing 32-bit libraries. diff --git a/.cirrus.yml b/.cirrus.yml index a7ae793bc4..29be50029b 100644 --- a/.cirrus.yml diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index ff5c668..082f2f9 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 62%{?dist} +Release: 63%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -743,6 +743,12 @@ exit 0 %endif %changelog +* Sat Nov 05 2022 Open vSwitch CI - 2.17.0-63 +- Merging upstream branch-2.17 [RH git: 209d631f40] + Commit list: + 4e3d762f05 ci: Update meson requirement for DPDK. + + * Fri Nov 04 2022 Open vSwitch CI - 2.17.0-62 - Merging upstream branch-2.17 [RH git: 4f4ee43eb4] Commit list: