Debian: Provide multi-arch support

This puts all libraries and pkg-config files in architecture-specific
directories for easier cross-compiling.

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

diff --git a/debian/compat b/debian/compat
index 45a4fb75db864000d01701c0f7a51864bd4daabf..ec635144f60048986bc560c5576355344005e6e7 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9

diff --git a/debian/control b/debian/control
index 42e6f16d5c44b794af56525a5b6995a00590c387..2173735692f8efe1eb6ab60aa34c00e2369ea123 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -56,6 +56,7 @@ Description: Open vSwitch datapath module source - DKMS version
 
 Package: openvswitch-common
 Architecture: linux-any
+Multi-Arch: foreign
 Depends: openssl,
          python (>= 2.7),
          python-six,
@@ -79,6 +80,7 @@ Description: Open vSwitch common components
 
 Package: libopenvswitch
 Architecture: linux-any
+Multi-Arch: same
 Depends: libssl-dev,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -302,6 +304,7 @@ Description: Open vSwitch VTEP utilities
 
 Package: libopenvswitch-dev
 Architecture: linux-any
+Multi-Arch: same
 Depends:
  libopenvswitch (>= ${binary:Version}),
  ${misc:Depends}

diff --git a/debian/libopenvswitch-dev.install b/debian/libopenvswitch-dev.install
index 11791e41e70c1d63a3565b346cb22b7919d13139..ca3d22cb25f945655da1548e4c5fefe63caf720d 100644 (file)
--- a/debian/libopenvswitch-dev.install
+++ b/debian/libopenvswitch-dev.install
@@ -1,6 +1,6 @@
-usr/lib/lib*.so
-usr/lib/lib*.a
-usr/lib/pkgconfig
+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

diff --git a/debian/libopenvswitch.install b/debian/libopenvswitch.install
index d0dbfd18ace910a77b0cfa9bcb567242ad5b88d8..3ddde584198421f0d2a3fef9d36cc110f3b8b76d 100644 (file)
--- a/debian/libopenvswitch.install
+++ b/debian/libopenvswitch.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*