[ovs-dev,v2] debian: Move libovn out from package libopenvswitch.

Message ID 1535159244-8022-1-git-send-email-hzhou8@ebay.com
State New
Headers show
Series
  • [ovs-dev,v2] debian: Move libovn out from package libopenvswitch.
Related show

Commit Message

Han Zhou Aug. 25, 2018, 1:07 a.m.
From: Han Zhou <hzhou8@ebay.com>

Since we are packaging OVN and OVS components separately, libovn
shouldn't belong to OVS, so move it to ovn-common. Also, remove
it from libopenvswitch-dev.

Signed-off-by: Han Zhou <hzhou8@ebay.com>
---
 debian/libopenvswitch-dev.install | 12 ++++++++++--
 debian/libopenvswitch.install     |  6 +++++-
 debian/ovn-common.install         |  1 +
 3 files changed, 16 insertions(+), 3 deletions(-)

Comments

Ben Pfaff Aug. 27, 2018, 4:41 p.m. | #1
On Fri, Aug 24, 2018 at 06:07:24PM -0700, Han Zhou wrote:
> From: Han Zhou <hzhou8@ebay.com>
> 
> Since we are packaging OVN and OVS components separately, libovn
> shouldn't belong to OVS, so move it to ovn-common. Also, remove
> it from libopenvswitch-dev.
> 
> Signed-off-by: Han Zhou <hzhou8@ebay.com>

This is one where I'd appreciate a Tested-by: from someone.  Anyone out
there?  :-)
aginwala Aug. 28, 2018, 2:34 a.m. | #2
Tested-by: aginwala <aginwala@ebay.com

On Mon, Aug 27, 2018 at 9:42 AM Ben Pfaff <blp@ovn.org> wrote:

> On Fri, Aug 24, 2018 at 06:07:24PM -0700, Han Zhou wrote:
> > From: Han Zhou <hzhou8@ebay.com>
> >
> > Since we are packaging OVN and OVS components separately, libovn
> > shouldn't belong to OVS, so move it to ovn-common. Also, remove
> > it from libopenvswitch-dev.
> >
> > Signed-off-by: Han Zhou <hzhou8@ebay.com>
>
> This is one where I'd appreciate a Tested-by: from someone.  Anyone out
> there?  :-)
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Ben Pfaff Aug. 28, 2018, 5:57 p.m. | #3
Thanks Han and aginwala.  I applied this to master.

On Mon, Aug 27, 2018 at 07:34:50PM -0700, aginwala wrote:
> Tested-by: aginwala <aginwala@ebay.com
> 
> On Mon, Aug 27, 2018 at 9:42 AM Ben Pfaff <blp@ovn.org> wrote:
> 
> > On Fri, Aug 24, 2018 at 06:07:24PM -0700, Han Zhou wrote:
> > > From: Han Zhou <hzhou8@ebay.com>
> > >
> > > Since we are packaging OVN and OVS components separately, libovn
> > > shouldn't belong to OVS, so move it to ovn-common. Also, remove
> > > it from libopenvswitch-dev.
> > >
> > > Signed-off-by: Han Zhou <hzhou8@ebay.com>
> >
> > This is one where I'd appreciate a Tested-by: from someone.  Anyone out
> > there?  :-)
> > _______________________________________________
> > dev mailing list
> > dev@openvswitch.org
> > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> >

Patch

diff --git a/debian/libopenvswitch-dev.install b/debian/libopenvswitch-dev.install
index ca3d22c..bda5a2c 100644
--- a/debian/libopenvswitch-dev.install
+++ b/debian/libopenvswitch-dev.install
@@ -1,5 +1,13 @@ 
-usr/lib/*/lib*.so
-usr/lib/*/lib*.a
+usr/lib/*/libopenvswitch*.so
+usr/lib/*/libofproto*.so
+usr/lib/*/libovsdb*.so
+usr/lib/*/libsflow*.so
+usr/lib/*/libvtep*.so
+usr/lib/*/libopenvswitch*.a
+usr/lib/*/libofproto*.a
+usr/lib/*/libovsdb*.a
+usr/lib/*/libsflow*.a
+usr/lib/*/libvtep*.a
 usr/lib/*/pkgconfig
 include/*.h usr/include/openvswitch
 include/openflow/*.h usr/include/openvswitch/openflow
diff --git a/debian/libopenvswitch.install b/debian/libopenvswitch.install
index 3ddde58..ce9dc40 100644
--- a/debian/libopenvswitch.install
+++ b/debian/libopenvswitch.install
@@ -1 +1,5 @@ 
-usr/lib/*/lib*.so.*
+usr/lib/*/libopenvswitch*.so.*
+usr/lib/*/libofproto*.so.*
+usr/lib/*/libovsdb*.so.*
+usr/lib/*/libsflow*.so.*
+usr/lib/*/libvtep*.so.*
diff --git a/debian/ovn-common.install b/debian/ovn-common.install
index e95ee6c..90484d2 100644
--- a/debian/ovn-common.install
+++ b/debian/ovn-common.install
@@ -4,3 +4,4 @@  usr/bin/ovn-trace
 usr/bin/ovn-detrace
 usr/share/openvswitch/scripts/ovn-ctl
 usr/share/openvswitch/scripts/ovndb-servers.ocf
+usr/lib/*/libovn*.so.*