| Message ID | 1481247067-51480-1-git-send-email-azhou@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Dec 8, 2016 at 8:31 PM, Andy Zhou <azhou@ovn.org> wrote: > OVN is packaged with openvswitch-fedora.spec.in, but not with > openvswitch.spec.in. Remove OVN files from openvswitch.spec.in > builds to make rpm build happy. > > Signed-off-by: Andy Zhou <azhou@ovn.org> > Acked-by: Russell Bryant <russell@ovn.org> but 1 minor suggestion ... > --- > rhel/openvswitch.spec.in | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in > index 9f6549a..14f6e98 100644 > --- a/rhel/openvswitch.spec.in > +++ b/rhel/openvswitch.spec.in > @@ -103,7 +103,8 @@ rm \ > $RPM_BUILD_ROOT/usr/bin/ovn-* \ > $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \ > $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \ > - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* > + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* \ > + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovndb-* > > or just "ovn*" instead of 2 lines ...
On Fri, Dec 9, 2016 at 11:21 AM, Russell Bryant <russell@ovn.org> wrote: > > > On Thu, Dec 8, 2016 at 8:31 PM, Andy Zhou <azhou@ovn.org> wrote: > >> OVN is packaged with openvswitch-fedora.spec.in, but not with >> openvswitch.spec.in. Remove OVN files from openvswitch.spec.in >> builds to make rpm build happy. >> >> Signed-off-by: Andy Zhou <azhou@ovn.org> >> > > Acked-by: Russell Bryant <russell@ovn.org> > Thanks, I will push it soon. > > but 1 minor suggestion ... > > >> --- >> rhel/openvswitch.spec.in | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in >> index 9f6549a..14f6e98 100644 >> --- a/rhel/openvswitch.spec.in >> +++ b/rhel/openvswitch.spec.in >> @@ -103,7 +103,8 @@ rm \ >> $RPM_BUILD_ROOT/usr/bin/ovn-* \ >> $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \ >> $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \ >> - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* >> + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* \ >> + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovndb-* >> >> > or just "ovn*" instead of 2 lines ... > Sure, why not.
diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in index 9f6549a..14f6e98 100644 --- a/rhel/openvswitch.spec.in +++ b/rhel/openvswitch.spec.in @@ -103,7 +103,8 @@ rm \ $RPM_BUILD_ROOT/usr/bin/ovn-* \ $RPM_BUILD_ROOT/usr/share/man/man?/ovn-* \ $RPM_BUILD_ROOT/usr/share/openvswitch/ovn-* \ - $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovn-* \ + $RPM_BUILD_ROOT/usr/share/openvswitch/scripts/ovndb-* (cd "$RPM_BUILD_ROOT" && rm -rf usr/%{_lib}/*.la) (cd "$RPM_BUILD_ROOT" && rm -rf usr/include)
OVN is packaged with openvswitch-fedora.spec.in, but not with openvswitch.spec.in. Remove OVN files from openvswitch.spec.in builds to make rpm build happy. Signed-off-by: Andy Zhou <azhou@ovn.org> --- rhel/openvswitch.spec.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)