From patchwork Wed Nov 7 20:13:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 10673013 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B826415A6 for ; Wed, 7 Nov 2018 20:13:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AACBE2D0F0 for ; Wed, 7 Nov 2018 20:13:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F82E2D091; Wed, 7 Nov 2018 20:13:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 296922D091 for ; Wed, 7 Nov 2018 20:13:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726487AbeKHFpR (ORCPT ); Thu, 8 Nov 2018 00:45:17 -0500 Received: from mail-ve1eur01on0083.outbound.protection.outlook.com ([104.47.1.83]:10159 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726352AbeKHFpR (ORCPT ); Thu, 8 Nov 2018 00:45:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=coIX54YnGk+A1jkx5Yf272Of568DOmQfqZq91gaLe1o=; b=IxNDGc+6LUe8kRW9WGjPFJn6tkwfVZWWqKwUPn7iduQKvpWQCe4FchXbSSvRjZuZeCObE2sV2rkpBgvWIyCAPzEugvU0PQxSxXjaoCfKgPAdZhDScRse5RenJyqb8V4P/pQb8VfC1Aez4A3bDGcUzArIltRBX/bszn+eQkmki8Q= Received: from AM6PR05MB5553.eurprd05.prod.outlook.com (20.177.119.202) by AM6PR05MB5031.eurprd05.prod.outlook.com (20.177.36.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1294.26; Wed, 7 Nov 2018 20:13:17 +0000 Received: from AM6PR05MB5553.eurprd05.prod.outlook.com ([fe80::90d3:b160:3d33:4c17]) by AM6PR05MB5553.eurprd05.prod.outlook.com ([fe80::90d3:b160:3d33:4c17%2]) with mapi id 15.20.1294.034; Wed, 7 Nov 2018 20:13:17 +0000 From: Jason Gunthorpe To: "linux-rdma@vger.kernel.org" Subject: [PATCH rdma-core] Fix travis build Thread-Topic: [PATCH rdma-core] Fix travis build Thread-Index: AQHUdtZSZNI0oYQ1g0WqGdJ65uBFIw== Date: Wed, 7 Nov 2018 20:13:17 +0000 Message-ID: <20181107201310.GA10336@ziepe.ca> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR1201CA0018.namprd12.prod.outlook.com (2603:10b6:301:4a::28) To AM6PR05MB5553.eurprd05.prod.outlook.com (2603:10a6:20b:30::10) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [174.3.196.123] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;AM6PR05MB5031;6:MaG53y2GEnXtzo7eUpnTkRf55aYFjEhNFceojoxnqelvlB5NeIULlsKPyLAVB/eFb1pO9+BmhzZOcyqsXV+zPxiNIRgwldUqI92+rv//DQybaipTtf9+Op7cWq+Wyoovcx70PUxuCf95iettVQQOKME8I2Vy1VwVR7BcH0aRWjVORnV80q3iJiOAgBMguvC3IZKRLRI8vZJ7X6HKfEkYW7CSdIusMRfEifbVXEs5Ww8cOHYb75qWWskYUw6iy/wIP9N7q04ZnHQM8xxoE/nW7VyRSe1ZS3NN9pFhHsWmcPP0xTRa57RU7NaaK384TnNTc7EBmtmRY+9LLnQmrsjZveA0PPKaTYWLQ+hYlDXzhECz+mg0+edYSGWTePekMqm8/YYF45bOFBOIfH2Nnh06lBfj688VlDATnc15xR/NDTNafLA6YkVZS5POTwaMNTP7vt4ozBhG0Zro7t8Eazgfjg==;5:eYiGRxTX88d8BIaZjEQz0ZC9WP9HTNKtMlQ+EEGEnP5yPL/dkRM83W01SunpntZzxgcWgcKWD2uKXKOgbdrrVJ857tMxGmIhn9Pf6wyxwN+ioMoEZIAMszrPHQN9TM8CO2+ttsomxyQrsaU7wSx46asQjSywf/hUJQWPOdo/ScE=;7:Y7TjERHcw0MrMgozqJDD5W+zeVp7PsrEP3AQlBQB2ce1UVQ/rFMU/x+qEFS8952sA2ufRcZBrJJATuDSgMoO2TVZayehWSTlE+8VRg6bq7UCR9bUxMZ6ozc7t/dD3+rBA2G48V9YqdedYIgK9TvG5Q== x-ms-office365-filtering-correlation-id: 079f1e7f-473a-4430-f157-08d644ed74a5 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);SRVR:AM6PR05MB5031; x-ms-traffictypediagnostic: AM6PR05MB5031: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231382)(944501410)(52105095)(3002001)(10201501046)(93006095)(93001095)(6055026)(148016)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201708071742011)(7699051)(76991095);SRVR:AM6PR05MB5031;BCL:0;PCL:0;RULEID:;SRVR:AM6PR05MB5031; x-forefront-prvs: 08497C3D99 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(199004)(189003)(97736004)(5640700003)(8936002)(6916009)(2351001)(99286004)(7736002)(6116002)(478600001)(305945005)(3846002)(486006)(36756003)(316002)(71200400001)(68736007)(25786009)(8676002)(81156014)(71190400001)(33656002)(105586002)(6486002)(81166006)(2906002)(26005)(106356001)(6436002)(33896004)(2501003)(256004)(6512007)(9686003)(1076002)(86362001)(66066001)(575784001)(386003)(186003)(476003)(2900100001)(102836004)(14454004)(53936002)(52116002)(6506007)(5660300001)(42262002);DIR:OUT;SFP:1101;SCL:1;SRVR:AM6PR05MB5031;H:AM6PR05MB5553.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: wpjdgylAJAxxkWygMYI2eimzwjBPTTspuLXHs44xU+DJNKipyugo1a6jTDXk9sx8ckQz2GNvUCsUiDAUL++fx920CSlfD6PvpPxOnNiN35II0S3Bb2wflPH0WJ5Uu+hgSVa9C7y+sbjj+WlTQ5H3M/HONOjCwjizIP8t2ro9unYy7oqFmK7gJu2FcZe74XAWv3XmUg93E0yhmiqVjJ0waC6tVImT9cqFJv9Q50uBLY2lmxm8FzlL69rdpiYOqoIFYdPQuQbRACLlzEBwJYm1zmcYOMTXCNCRKgCbI1+j8RLloQ9+Q1+2E6Np2FLujG5ERz2PKO/y5cKOBkaQvwvziITBT3z41/tOv5SSMlBvJMI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-ID: MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 079f1e7f-473a-4430-f157-08d644ed74a5 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Nov 2018 20:13:17.7130 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR05MB5031 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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. 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