From 102d234a1d9d0d901d6fcc006fda0a05ca38dc8c Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Jul 29 2022 20:26:03 +0000 Subject: Import openvswitch2.15-2.15.0-113 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 2e4abf9..5d43797 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -21753,6 +21753,28 @@ index d75d66b863..ba096dd0c8 100644 void jsonrpc_session_set_max_backoff(struct jsonrpc_session *, int max_backoff); +diff --git a/lib/libopenvswitch.pc.in b/lib/libopenvswitch.pc.in +index 2a3f2ca7bc..44fbb1f9fd 100644 +--- a/lib/libopenvswitch.pc.in ++++ b/lib/libopenvswitch.pc.in +@@ -7,5 +7,5 @@ Name: libopenvswitch + Description: Open vSwitch library + Version: @VERSION@ + Libs: -L${libdir} -lopenvswitch +-Libs.private: @LIBS@ +-Cflags: -I${includedir}/openvswitch ++Libs.private: @LIBS@ @SSL_LIBS@ @CAPNG_LDADD@ @LIBBPF_LDADD@ ++Cflags: -I${includedir} +diff --git a/lib/libsflow.pc.in b/lib/libsflow.pc.in +index e70a2b7048..34bb7e3d69 100644 +--- a/lib/libsflow.pc.in ++++ b/lib/libsflow.pc.in +@@ -8,4 +8,4 @@ Description: sFlow library of Open vSwitch + Version: @VERSION@ + Libs: -L${libdir} -lsflow + Libs.private: @LIBS@ +-Cflags: -I${includedir}/openvswitch ++Cflags: -I${includedir} diff --git a/lib/lldp/lldp.c b/lib/lldp/lldp.c index 18afbab9a7..dfeb2a8002 100644 --- a/lib/lldp/lldp.c @@ -24831,6 +24853,16 @@ index d5abe9c2ed..dcecdab212 100755 import getopt import re import sys +diff --git a/ofproto/libofproto.pc.in b/ofproto/libofproto.pc.in +index 2740712505..49894fb695 100644 +--- a/ofproto/libofproto.pc.in ++++ b/ofproto/libofproto.pc.in +@@ -8,4 +8,4 @@ Description: OpenFlow library of Open vSwitch + Version: @VERSION@ + Libs: -L${libdir} -lofproto + Libs.private: @LIBS@ +-Cflags: -I${includedir}/openvswitch ++Cflags: -I${includedir} diff --git a/ofproto/ofproto-dpif-ipfix.c b/ofproto/ofproto-dpif-ipfix.c index 796eb6f881..92692470fd 100644 --- a/ofproto/ofproto-dpif-ipfix.c @@ -26127,6 +26159,16 @@ index 0b8bdfe378..f38c3c5771 100644 ovsdb_storage_unread(storage); break; } +diff --git a/ovsdb/libovsdb.pc.in b/ovsdb/libovsdb.pc.in +index fe367ea7b1..54c9039cfd 100644 +--- a/ovsdb/libovsdb.pc.in ++++ b/ovsdb/libovsdb.pc.in +@@ -8,4 +8,4 @@ Description: OVSDB library of Open vSwitch + Version: @VERSION@ + Libs: -L${libdir} -lovsdb + Libs.private: @LIBS@ +-Cflags: -I${includedir}/openvswitch ++Cflags: -I${includedir} diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 72756eb1f2..ba28e36d78 100644 --- a/ovsdb/ovsdb-client.c @@ -27232,6 +27274,60 @@ index d385d83722..cfe01763f3 100644 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', +diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in +index 9b1a121f23..5f989bc9fd 100644 +--- a/rhel/openvswitch-fedora.spec.in ++++ b/rhel/openvswitch-fedora.spec.in +@@ -189,20 +189,6 @@ make install DESTDIR=$RPM_BUILD_ROOT + install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch + install -d -m 0750 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch + install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch +-copy_headers() { +- src=$1 +- dst=$RPM_BUILD_ROOT/$2 +- install -d -m 0755 $dst +- install -m 0644 $src/*.h $dst +-} +-copy_headers include %{_includedir}/openvswitch +-copy_headers include/openflow %{_includedir}/openvswitch/openflow +-copy_headers include/openvswitch %{_includedir}/openvswitch/openvswitch +-copy_headers include/sparse %{_includedir}/openvswitch/sparse +-copy_headers include/sparse/arpa %{_includedir}/openvswitch/sparse/arpa +-copy_headers include/sparse/netinet %{_includedir}/openvswitch/sparse/netinet +-copy_headers include/sparse/sys %{_includedir}/openvswitch/sparse/sys +-copy_headers lib %{_includedir}/openvswitch/lib + + %if %{with dpdk} + install -p -D -m 0644 rhel/usr_lib_udev_rules.d_91-vfio.rules \ +diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in +index ee8b3c9eac..e5e092d11e 100644 +--- a/rhel/openvswitch.spec.in ++++ b/rhel/openvswitch.spec.in +@@ -108,24 +108,6 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_rundir}/openvswitch + install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/log/openvswitch + install -d -m 0755 $RPM_BUILD_ROOT/var/lib/openvswitch + +-copy_headers() { +- src=$1 +- dst=$RPM_BUILD_ROOT/$2 +- install -d -m 0755 $dst +- install -m 0644 $src/*.h $dst +-} +-copy_headers include %{_includedir}/openvswitch +-copy_headers include/openflow %{_includedir}/openvswitch/openflow +-copy_headers include/openvswitch %{_includedir}/openvswitch/openvswitch +-copy_headers include/sparse %{_includedir}/openvswitch/sparse +-copy_headers include/sparse/arpa %{_includedir}/openvswitch/sparse/arpa +-copy_headers include/sparse/netinet %{_includedir}/openvswitch/sparse/netinet +-copy_headers include/sparse/sys %{_includedir}/openvswitch/sparse/sys +-copy_headers lib %{_includedir}/openvswitch/lib +- +-install -D -m 0644 lib/.libs/libopenvswitch.a \ +- $RPM_BUILD_ROOT/%{_libdir}/libopenvswitch.a +- + %check + %if %{with check} + if make check TESTSUITEFLAGS='%{_smp_mflags}' RECHECK=yes; then :; diff --git a/tests/atlocal.in b/tests/atlocal.in index 02e2dc57f2..cfca7e1926 100644 --- a/tests/atlocal.in diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index e883014..b2ad6db 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: 112%{?dist} +Release: 113%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -702,6 +702,13 @@ exit 0 %endif %changelog +* Fri Jul 29 2022 Open vSwitch CI - 2.15.0-113 +- Merging upstream branch-2.15 [RH git: d3374dc711] + Commit list: + f2024c9ef9 libopenvswitch.pc: Add missing libs for a static build. + a8e6816ab2 rhel: Stop installing internal headers. + + * Tue Jul 26 2022 Open vSwitch CI - 2.15.0-112 - Merging upstream branch-2.15 [RH git: 14ed491a9f] Commit list: