[rdma-core] Fix travis build

Commit Message

Jason Gunthorpe Nov. 7, 2018, 8:13 p.m. UTC

Somehow the breakages caused in check-build by the static libraries was
missed. Ignore the static libraries when checking shared library sonames
and do not hardcode the PABI version in the debian packaging files.

Signed-off-by: Jason Gunthorpe <[e-mail]>
---
 buildlib/check-build          | 2 +-
 debian/libibverbs-dev.install | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

I think this was missed because the checkpatch and real CI are
intermixed. We really need a better CI service.

Patch

diff --git a/buildlib/check-build b/buildlib/check-build
index 4c76814d4f050c..5ae0cc1cc79b32 100755
--- a/buildlib/check-build
+++ b/buildlib/check-build
@@ -142,7 +142,7 @@  def test_verbs_private(args):
     libd = os.path.join(args.BUILD,"lib");
     with inDirectory(libd):
         for fn in os.listdir("."):
-            if not os.path.islink(fn) and "rdmav" in fn:
+            if not os.path.islink(fn) and "rdmav" in fn and fn.endswith(".so"):
                 check_verbs_abi(args,fn);
 
 # -------------------------------------------------------------------------
diff --git a/debian/libibverbs-dev.install b/debian/libibverbs-dev.install
index f2898d7e641e23..19588068c43d4a 100644
--- a/debian/libibverbs-dev.install
+++ b/debian/libibverbs-dev.install
@@ -10,7 +10,7 @@  usr/include/infiniband/sa.h
 usr/include/infiniband/tm_types.h
 usr/include/infiniband/verbs.h
 usr/include/infiniband/verbs_api.h
-usr/lib/*/lib*-rdmav20.a
+usr/lib/*/lib*-rdmav*.a
 usr/lib/*/libibverbs*.so
 usr/lib/*/libibverbs.a
 usr/lib/*/libmlx4.a