aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-07-06 01:29:09 -0700
committerRoland Dreier <roland@purestorage.com>2011-07-06 01:29:09 -0700
commit64670397753cc6ea9d169ae6cc02e973f105b5d3 (patch)
treebb736116b7afffbe834e0a2805649ac19de2c391
parent5813185c8badcba493d308a2f5192fb2f2f5d457 (diff)
downloadlibmlx4-64670397753cc6ea9d169ae6cc02e973f105b5d3.tar.gz
Move plugin .so to /usr/lib/libibverbs
This fixes multiple lintian warnings such as package-name-doesnt-match-sonames, pkg-has-shlibs-control-file-but-no-actual-shared-libs etc. Signed-off-by: Roland Dreier <roland@purestorage.com>
-rw-r--r--debian/changelog4
-rw-r--r--debian/libmlx4-1.install2
-rw-r--r--debian/patches/driver-plugin-directory.patch10
-rw-r--r--debian/patches/series1
4 files changed, 15 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b13c0fd..039d9ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ libmlx4 (1.0.1-2) UNRELEASED; urgency=low
* Switch to dpkg-source 3.0 (quilt) format.
* Don't ship .la files. (Closes: #621664)
* Change build system from cdbs to debhelper 7.
+ * Use libibverbs 1.1.3 feature to move plugin to /usr/lib/libibverbs
+ to fix multiple problems with a not-exactly-shlib in /usr/lib.
- -- Roland Dreier <roland@digitalvampire.org> Wed, 06 Jul 2011 01:20:43 -0700
+ -- Roland Dreier <roland@digitalvampire.org> Wed, 06 Jul 2011 01:28:28 -0700
libmlx4 (1.0.1-1) unstable; urgency=low
diff --git a/debian/libmlx4-1.install b/debian/libmlx4-1.install
index a64e17d..8cab406 100644
--- a/debian/libmlx4-1.install
+++ b/debian/libmlx4-1.install
@@ -1,2 +1,2 @@
-usr/lib/libmlx4-rdmav2.so
+usr/lib/libmlx4-rdmav2.so /usr/lib/libibverbs/
etc/libibverbs.d/mlx4.driver
diff --git a/debian/patches/driver-plugin-directory.patch b/debian/patches/driver-plugin-directory.patch
new file mode 100644
index 0000000..fd73a73
--- /dev/null
+++ b/debian/patches/driver-plugin-directory.patch
@@ -0,0 +1,10 @@
+Description: Tell libibverbs to look in /usr/lib/libibverbs for plugin library
+Author: Roland Dreier <roland@digitalvampire.org>
+
+Index: libmlx4.git/mlx4.driver
+===================================================================
+--- libmlx4.git.orig/mlx4.driver 2011-07-06 01:27:34.521058451 -0700
++++ libmlx4.git/mlx4.driver 2011-07-06 01:27:47.051074172 -0700
+@@ -1 +1 @@
+-driver mlx4
++driver /usr/lib/libibverbs/libmlx4
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..213f49e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+driver-plugin-directory.patch