summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorBen Warren <ben@skyportsystems.com>2017-06-08 13:47:03 -0700
committerBen Pfaff <blp@ovn.org>2017-06-14 14:02:28 -0700
commit24aefb1845ed73d206cb3f368cae10b3b2e28367 (patch)
tree894bea1a72f862384fe24f4fea9220bbb6d9304e /debian
parentc33e9122dbc369e6bbe6dc3b1ebdcb11b56cdf07 (diff)
downloadopenvswitch-24aefb1845ed73d206cb3f368cae10b3b2e28367.tar.gz
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>
Diffstat (limited to 'debian')
-rw-r--r--debian/compat2
-rw-r--r--debian/control3
-rw-r--r--debian/libopenvswitch-dev.install6
-rw-r--r--debian/libopenvswitch.install2
4 files changed, 8 insertions, 5 deletions
diff --git a/debian/compat b/debian/compat
index 45a4fb75d..ec635144f 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 42e6f16d5..217373569 100644
--- 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 11791e41e..ca3d22cb2 100644
--- 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 d0dbfd18a..3ddde5841 100644
--- a/debian/libopenvswitch.install
+++ b/debian/libopenvswitch.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*