diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch index a7f52d9..7055195 100644 --- a/SOURCES/openvswitch-2.17.0.patch +++ b/SOURCES/openvswitch-2.17.0.patch @@ -44,6 +44,19 @@ index 1fe890846e..321b9bf86e 100755 if [ "$M32" ]; then # Installing 32-bit libraries. +diff --git a/.ci/osx-build.sh b/.ci/osx-build.sh +index f8facebeb0..36c4d9e4e4 100755 +--- a/.ci/osx-build.sh ++++ b/.ci/osx-build.sh +@@ -25,7 +25,7 @@ function configure_ovs() + ./boot.sh && ./configure $* + } + +-configure_ovs $EXTRA_OPTS $* ++configure_ovs $EXTRA_OPTS $OPTS $* + + if [ "$CC" = "clang" ]; then + make CFLAGS="$CFLAGS -Wno-error=unused-command-line-argument" diff --git a/.cirrus.yml b/.cirrus.yml index a7ae793bc4..2fadab64a7 100644 --- a/.cirrus.yml diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec index 3eaa665..802b5bd 100644 --- a/SPECS/openvswitch2.17.spec +++ b/SPECS/openvswitch2.17.spec @@ -63,7 +63,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.17.0 -Release: 110%{?dist} +Release: 111%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -749,6 +749,12 @@ exit 0 %endif %changelog +* Fri Aug 04 2023 Open vSwitch CI - 2.17.0-111 +- Merging upstream branch-2.17 [RH git: 912b401c09] + Commit list: + 65bb823690 ci: Fix OPTS not being passed to OSX builds. + + * Thu Aug 03 2023 Open vSwitch CI - 2.17.0-110 - Merging upstream branch-2.17 [RH git: 71b356438e] Commit list: