diff mbox

[ovs-dev,2/2] Debian: Provide multi-arch support

Message ID 7fe928606e1b9519990373e7a981c6ee4560d81a.1496950313.git.ben@skyportsystems.com
State Accepted
Headers show

Commit Message

Li,Rongqing via dev June 8, 2017, 8:47 p.m. UTC 
From: Ben Warren <ben@skyportsystems.com>

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

Signed-off-by: Ben Warren <ben@skyportsystems.com>
---
 debian/compat                     | 2 +-
 debian/control                    | 3 +++
 debian/libopenvswitch-dev.install | 6 +++---
 debian/libopenvswitch.install     | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
diff mbox

Patch

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@ 
-8
+9
diff --git a/debian/control b/debian/control
index 42e6f16..2173735 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 11791e4..ca3d22c 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 d0dbfd1..3ddde58 100644
--- a/debian/libopenvswitch.install
+++ b/debian/libopenvswitch.install
@@ -1 +1 @@ 
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*