Debian: Rework libopenvswitch packages

The 'openvswitch-common' package did not work well with cross-compiling
since it required Python.  This package is broken into two packages as
follows:
- libopenvwitch: contains library files (.a, .so)
- openvswitch-common: depends on libopenvswitch, contains command-line
  tools such as ovs-ofctl, ovs-appctl etc.

In addition, this 'openvswitch-dev' library is renamed to
'libopenvswitch-dev' to align more closely with Debian policy.  It
depends on libopenvswitch.

Signed-off-by: Ben Warren <ben@skyportsystems.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/debian/.gitignore b/debian/.gitignore
index 4baed48e11286f96d281218388d616994133f145..9ec70eb9ccd461ca6cbb6a461e0e071953054cff 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -6,6 +6,8 @@
 /control
 /copyright
 /files
+/libopenvswitch
+/libopenvswitch-dev
 /nicira-switch
 /openvswitch
 /openvswitch-common
@@ -13,7 +15,6 @@
 /openvswitch-datapath-source
 /openvswitch-datapath-dkms
 /openvswitch-dbg
-/openvswitch-dev
 /openvswitch-ipsec
 /openvswitch-pki
 /openvswitch-switch
@@ -22,6 +23,7 @@
 /openvswitch-testcontroller
 /openvswitch-vtep
 /ovn-common
+/ovn-controller-vtep
 /ovn-host
 /ovn-central
 /ovn-docker

diff --git a/debian/automake.mk b/debian/automake.mk
index 07ea912c47aeb53dce0da58bd56b06ec1f7b31a5..4d8e204bb211785b74869a5661e317657cf6cbd0 100644 (file)
--- a/debian/automake.mk
+++ b/debian/automake.mk
@@ -7,6 +7,8 @@ EXTRA_DIST += \
        debian/copyright.in \
        debian/dkms.conf.in \
        debian/dirs \
+       debian/libopenvswitch.install \
+       debian/libopenvswitch-dev.install \
        debian/openvswitch-common.dirs \
        debian/openvswitch-common.docs \
        debian/openvswitch-common.install \
@@ -18,7 +20,6 @@ EXTRA_DIST += \
        debian/openvswitch-datapath-source.copyright \
        debian/openvswitch-datapath-source.dirs \
        debian/openvswitch-datapath-source.install \
-       debian/openvswitch-dev.install \
        debian/openvswitch-pki.dirs \
        debian/openvswitch-pki.postinst \
        debian/openvswitch-pki.postrm \

diff --git a/debian/control b/debian/control
index 0b75f2b53cf4d5ab5506b3c3f6f8474d5b0e4a28..42e6f16d5c44b794af56525a5b6995a00590c387 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,7 @@ Architecture: linux-any
 Depends: openssl,
          python (>= 2.7),
          python-six,
+         libopenvswitch (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: ethtool
@@ -76,6 +77,22 @@ Description: Open vSwitch common components
  openvswitch-common provides components required by both openvswitch-switch
  and openvswitch-testcontroller.
 
+Package: libopenvswitch
+Architecture: linux-any
+Depends: libssl-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Open vSwitch common components
+ Open vSwitch is a production quality, multilayer, software-based,
+ Ethernet virtual switch. It is designed to enable massive network
+ automation through programmatic extension, while still supporting
+ standard management interfaces and protocols (e.g. NetFlow, IPFIX,
+ sFlow, SPAN, RSPAN, CLI, LACP, 802.1ag). In addition, it is designed
+ to support distribution across multiple physical servers similar to
+ VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V.
+ .
+ libopenvswitch provides runtime libraries for use by openvswitch binaries
+
 Package: openvswitch-switch
 Architecture: linux-any
 Suggests: openvswitch-datapath-module
@@ -283,11 +300,13 @@ Description: Open vSwitch VTEP utilities
  This package provides utilities that are useful to interact with a
  VTEP-configured database and a VTEP emulator.
 
-Package: openvswitch-dev
+Package: libopenvswitch-dev
 Architecture: linux-any
 Depends:
- openvswitch-common (>= ${binary:Version}),
+ libopenvswitch (>= ${binary:Version}),
  ${misc:Depends}
+Conflicts: openvswitch-dev
+Replaces: openvswitch-dev
 Description: Open vSwitch development package
  Open vSwitch is a production quality, multilayer, software-based, Ethernet
  virtual switch. It is designed to enable massive network automation through

diff --git a/debian/libopenvswitch-dev.install b/debian/libopenvswitch-dev.install
new file mode 100644 (file)
index 0000000..11791e4
--- /dev/null
+++ b/debian/libopenvswitch-dev.install
@@ -0,0 +1,11 @@
+usr/lib/lib*.so
+usr/lib/lib*.a
+usr/lib/pkgconfig
+include/*.h usr/include/openvswitch
+include/openflow/*.h usr/include/openvswitch/openflow
+include/openvswitch/*.h usr/include/openvswitch/openvswitch
+include/sparse/*.h usr/include/openvswitch/sparse
+include/sparse/arpa/*.h usr/include/openvswitch/sparse/arpa
+include/sparse/netinet/*.h usr/include/openvswitch/sparse/netinet
+include/sparse/sys/*.h usr/include/openvswitch/sparse/sys
+lib/*.h usr/include/openvswitch/lib

diff --git a/debian/libopenvswitch.install b/debian/libopenvswitch.install
new file mode 100644 (file)
index 0000000..d0dbfd1
--- /dev/null
+++ b/debian/libopenvswitch.install
@@ -0,0 +1 @@
+usr/lib/lib*.so.*

diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index ebb7d5c1a0e1fdca00c82326aee280d236a10e6d..3264ea53ccf10f6be0c0a8fe2978b29cadbd60e2 100644 (file)
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -9,4 +9,3 @@ usr/sbin/ovs-bugtool
 usr/share/openvswitch/bugtool-plugins
 usr/share/openvswitch/scripts/ovs-bugtool-*
 usr/share/openvswitch/scripts/ovs-lib
-usr/lib/lib*.so.*

diff --git a/debian/openvswitch-dev.install b/debian/openvswitch-dev.install
deleted file mode 100644 (file)
index 11791e4..0000000
--- a/debian/openvswitch-dev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/lib/lib*.so
-usr/lib/lib*.a
-usr/lib/pkgconfig
-include/*.h usr/include/openvswitch
-include/openflow/*.h usr/include/openvswitch/openflow
-include/openvswitch/*.h usr/include/openvswitch/openvswitch
-include/sparse/*.h usr/include/openvswitch/sparse
-include/sparse/arpa/*.h usr/include/openvswitch/sparse/arpa
-include/sparse/netinet/*.h usr/include/openvswitch/sparse/netinet
-include/sparse/sys/*.h usr/include/openvswitch/sparse/sys
-lib/*.h usr/include/openvswitch/lib