Message ID | 20200715124049.61960-1-roid@mellanox.com |
---|---|
State | Accepted |
Delegated to: | Ilya Maximets |
Headers | show |
Series | [ovs-dev] rhel: openvswitch-fedora.spec.in: Fix installed but not packaged | expand |
> -----Original Message----- > From: Roi Dayan <roid@mellanox.com> > Sent: Wednesday, July 15, 2020 1:41 PM > To: dev@openvswitch.org > Cc: Van Haaren, Harry <harry.van.haaren@intel.com>; Ilya Maximets > <i.maximets@ovn.org>; Ben Pfaff <blp@ovn.org>; Simon Horman > <simon.horman@netronome.com>; Roi Dayan <roid@mellanox.com> > Subject: [PATCH] rhel: openvswitch-fedora.spec.in: Fix installed but not packaged > > With the cited commit, we get an error from rpmbuild about installed > but not packaged /usr/lib64/libopenvswitchavx512.a. > Fix it by treating it as the other la files. > > Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") > Signed-off-by: Roi Dayan <roid@mellanox.com> > --- > rhel/openvswitch-fedora.spec.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in > index 7bc8c34b80af..e3e0d8acfc2d 100644 > --- a/rhel/openvswitch-fedora.spec.in > +++ b/rhel/openvswitch-fedora.spec.in > @@ -402,6 +402,7 @@ fi > %{_includedir}/openvswitch/* > %{_includedir}/openflow/* > %exclude %{_libdir}/*.la > +%exclude %{_libdir}/*.a > > %if 0%{?rhel} > 7 || 0%{?fedora} > 28 > %files -n network-scripts-%{name} Hi Roi, Note the discussion ongoing on this thread, where similar solutions are proposed for similar issues: https://mail.openvswitch.org/pipermail/ovs-dev/2020-July/372954.html I think there is a decision to be made on that thread, and we can incorporate the fix suggested here if required based on the outcome of that discussion. Thanks, -Harry
> With the cited commit, we get an error from rpmbuild about installed but not > packaged /usr/lib64/libopenvswitchavx512.a. > Fix it by treating it as the other la files. > > Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") > Signed-off-by: Roi Dayan <roid@mellanox.com> > --- > rhel/openvswitch-fedora.spec.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in > index 7bc8c34b80af..e3e0d8acfc2d 100644 > --- a/rhel/openvswitch-fedora.spec.in > +++ b/rhel/openvswitch-fedora.spec.in > @@ -402,6 +402,7 @@ fi > %{_includedir}/openvswitch/* > %{_includedir}/openflow/* > %exclude %{_libdir}/*.la > +%exclude %{_libdir}/*.a > > %if 0%{?rhel} > 7 || 0%{?fedora} > 28 > %files -n network-scripts-%{name} From myside this looks ok. However happy to have someone on packaging to confirm as well before merging. Acked-by: Ian Stokes <ian.stokes@intel.com> > -- > 2.8.4 > > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
On 7/15/2020 5:40 AM, Roi Dayan wrote: > With the cited commit, we get an error from rpmbuild about installed > but not packaged /usr/lib64/libopenvswitchavx512.a. > Fix it by treating it as the other la files. > > Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") > Signed-off-by: Roi Dayan <roid@mellanox.com> > --- > rhel/openvswitch-fedora.spec.in | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in > index 7bc8c34b80af..e3e0d8acfc2d 100644 > --- a/rhel/openvswitch-fedora.spec.in > +++ b/rhel/openvswitch-fedora.spec.in > @@ -402,6 +402,7 @@ fi > %{_includedir}/openvswitch/* > %{_includedir}/openflow/* > %exclude %{_libdir}/*.la > +%exclude %{_libdir}/*.a > > %if 0%{?rhel} > 7 || 0%{?fedora} > 28 > %files -n network-scripts-%{name} > Works for me. Tested-by: Greg Rose <gvrose8192@gmail.com> Acked-by: Greg Rose <gvrose8192@gmail.com>
On 7/16/20 2:32 PM, Stokes, Ian wrote: >> With the cited commit, we get an error from rpmbuild about installed but not >> packaged /usr/lib64/libopenvswitchavx512.a. >> Fix it by treating it as the other la files. >> >> Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") >> Signed-off-by: Roi Dayan <roid@mellanox.com> >> --- >> rhel/openvswitch-fedora.spec.in | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in >> index 7bc8c34b80af..e3e0d8acfc2d 100644 >> --- a/rhel/openvswitch-fedora.spec.in >> +++ b/rhel/openvswitch-fedora.spec.in >> @@ -402,6 +402,7 @@ fi >> %{_includedir}/openvswitch/* >> %{_includedir}/openflow/* >> %exclude %{_libdir}/*.la >> +%exclude %{_libdir}/*.a >> >> %if 0%{?rhel} > 7 || 0%{?fedora} > 28 >> %files -n network-scripts-%{name} > > From myside this looks ok. However happy to have someone on packaging to confirm as well before merging. > > Acked-by: Ian Stokes <ian.stokes@intel.com> We're explicitly disabling build of static libraries in this spec file, so it's OK to exclude them. Thanks, everyone! Applied to master. Best regards, Ilya Maximets.
diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in index 7bc8c34b80af..e3e0d8acfc2d 100644 --- a/rhel/openvswitch-fedora.spec.in +++ b/rhel/openvswitch-fedora.spec.in @@ -402,6 +402,7 @@ fi %{_includedir}/openvswitch/* %{_includedir}/openflow/* %exclude %{_libdir}/*.la +%exclude %{_libdir}/*.a %if 0%{?rhel} > 7 || 0%{?fedora} > 28 %files -n network-scripts-%{name}
With the cited commit, we get an error from rpmbuild about installed but not packaged /usr/lib64/libopenvswitchavx512.a. Fix it by treating it as the other la files. Fixes: 352b6c7116cd ("dpif-lookup: add avx512 gather implementation.") Signed-off-by: Roi Dayan <roid@mellanox.com> --- rhel/openvswitch-fedora.spec.in | 1 + 1 file changed, 1 insertion(+)