| Message ID | 1536781431-84928-1-git-send-email-martinxu9.ovs@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,v3] rhel: Ship ovs shared libraries, fedora | expand |
On Wed, Sep 12, 2018 at 12:43:51PM -0700, Martin Xu wrote: > This patch extends 4886d4d2495b (debian, rhel: Ship ovs shared libraries > and header files) to fedora, by packaging the shared libraries in > openvswitch and openvswitch-dvel RPM. These files are always packaged in > the RPMs built with rhel6 spec file. > > VMware-BZ: #2036847 > > Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com> > CC: Flavio Leitner <fbl@redhat.com> > --- Acked-by: Flavio Leitner <fbl@redhat.com> Thanks Martin! fbl
On Wed, Sep 12, 2018 at 07:55:57PM -0300, Flavio Leitner wrote: > On Wed, Sep 12, 2018 at 12:43:51PM -0700, Martin Xu wrote: > > This patch extends 4886d4d2495b (debian, rhel: Ship ovs shared libraries > > and header files) to fedora, by packaging the shared libraries in > > openvswitch and openvswitch-dvel RPM. These files are always packaged in > > the RPMs built with rhel6 spec file. > > > > VMware-BZ: #2036847 > > > > Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com> > > CC: Flavio Leitner <fbl@redhat.com> > > --- > > Acked-by: Flavio Leitner <fbl@redhat.com> Thanks Martin and Flavio. I applied this to master and branch-2.10. It looks like the cited base patch was also in 2.9 and 2.8 but the patch didn't apply cleanly so I skipped those backports. If you do want a backport that far, please send a patch with the conflict resolved. Thanks, Ben.
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index cb7ecca..ba55fb5 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -236,6 +236,7 @@ Docker network plugins for OVN. --with-dpdk=$(dirname %{_datadir}/dpdk/*/.config) \ %endif --enable-ssl \ + --enable-shared \ --with-pkidir=%{_sharedstatedir}/openvswitch/pki \ %if 0%{?fedora} > 22 || %{with build_python3} PYTHON3=%{__python3} \ @@ -536,6 +537,7 @@ fi %{python2_sitelib}/ovstest %files devel +%{_libdir}/lib*.so %{_libdir}/*.a %{_libdir}/*.la %{_libdir}/pkgconfig/*.pc @@ -592,6 +594,7 @@ fi %{_bindir}/ovs-testcontroller %{_bindir}/ovs-pki %{_bindir}/vtep-ctl +%{_libdir}/lib*.so.* %{_sbindir}/ovs-bugtool %{_sbindir}/ovs-vswitchd %{_sbindir}/ovsdb-server
This patch extends 4886d4d2495b (debian, rhel: Ship ovs shared libraries and header files) to fedora, by packaging the shared libraries in openvswitch and openvswitch-dvel RPM. These files are always packaged in the RPMs built with rhel6 spec file. VMware-BZ: #2036847 Signed-off-by: Martin Xu <martinxu9.ovs@gmail.com> CC: Flavio Leitner <fbl@redhat.com> --- v1->v2: change from conditional to always ship share libraries v2->v3: package libraries in openvswitch and openvswitch-devel RPM rhel/openvswitch-fedora.spec.in | 3 +++ 1 file changed, 3 insertions(+)