diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index f1bae5a..7707578 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -21,11 +21,15 @@ index 3e5136fd4e..1acf5012db 100755 # testsuite.log is necessary for debugging. cat */_build/sub/tests/testsuite.log diff --git a/.cirrus.yml b/.cirrus.yml -index 2caf36b85c..358f2ba256 100644 +index 2caf36b85c..480fea2421 100644 --- a/.cirrus.yml +++ b/.cirrus.yml -@@ -8,8 +8,8 @@ freebsd_build_task: - memory: 8G +@@ -5,11 +5,11 @@ freebsd_build_task: + image_family: freebsd-12-2-snap + image_family: freebsd-11-4-snap + cpu: 4 +- memory: 8G ++ memory: 4G env: - DEPENDENCIES: automake libtool gmake gcc wget openssl diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 93bce86..adf9eed 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: 39%{?dist} +Release: 41%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -675,9 +675,11 @@ exit 0 %doc LICENSE NOTICE README.rst NEWS rhel/README.RHEL.rst %ifarch %{dpdkarches} %doc %{dpdkdir}/README.DPDK-PMDS +%attr(750,openvswitch,hugetlbfs) %verify(not owner group) /var/log/openvswitch +%else +%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch %endif /var/lib/openvswitch -%attr(750,openvswitch,openvswitch) %verify(not owner group) /var/log/openvswitch %ghost %attr(755,root,root) %verify(not owner group) %{_rundir}/openvswitch %{_datadir}/openvswitch/bugtool-plugins/ %{_datadir}/openvswitch/scripts/ovs-bugtool-* @@ -697,6 +699,17 @@ exit 0 %endif %changelog +* Mon Sep 27 2021 Open vSwitch CI - 2.15.0-41 +- Merging upstream branch-2.15 [RH git: 8f2e30f011] + Commit list: + a2f860aa2e cirrus: Reduce memory requirements for FreeBSD VMs. + + +* Thu Sep 23 2021 Timothy Redaelli - 2.15.0-40 +- redhat: use hugetlbfs group for /var/log/openvswitch when dpdk is enabled [RH git: 5ccf239b51] (#2007290) + Resolves: #2007290 + + * Thu Sep 16 2021 Open vSwitch CI - 2.15.0-39 - Merging upstream branch-2.15 [RH git: c6bdfa8cc1] Commit list: