From 2d10763d6a48b77925be29c6eaf55ffff20ddb0d Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Jan 10 2023 01:40:03 +0000 Subject: Import openvswitch2.13-2.13.0-212 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 9098a0d..8cc04df 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -341,7 +341,7 @@ index 0000000000..b6447aba1b +set -ev +pip3 install --user --upgrade docutils diff --git a/.cirrus.yml b/.cirrus.yml -index 1b32f55d65..b4ce3cde16 100644 +index 1b32f55d65..bca691a956 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -2,21 +2,23 @@ freebsd_build_task: @@ -350,7 +350,7 @@ index 1b32f55d65..b4ce3cde16 100644 matrix: - image_family: freebsd-12-1-snap - image_family: freebsd-11-3-snap -+ image_family: freebsd-12-3-snap ++ image_family: freebsd-12-4-snap + image_family: freebsd-13-1-snap cpu: 4 - memory: 8G diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index 8422ba4..22ee4f7 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: 211%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 212%{?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 @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Mon Jan 09 2023 Open vSwitch CI - 2.13.0-212 +- Merging upstream branch-2.13 [RH git: 3b57b75f43] + Commit list: + 581f4a4501 cirrus: Update to use FreeBSD 12.4. + + * Fri Jan 06 2023 Open vSwitch CI - 2.13.0-211 - Merging upstream branch-2.13 [RH git: 6116eb6235] Commit list: