From patchwork Tue Jul 23 19:01:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055169 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 C1FE26C5 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4E4C28724 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A975428732; Tue, 23 Jul 2019 19:01:50 +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 483F428724 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391643AbfGWTBt (ORCPT ); Tue, 23 Jul 2019 15:01:49 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:43244 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391637AbfGWTBt (ORCPT ); Tue, 23 Jul 2019 15:01:49 -0400 Received: by mail-qt1-f194.google.com with SMTP id w17so42911119qto.10 for ; Tue, 23 Jul 2019 12:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OvdZj+SFpT7mCy/KQvKHVvn4GvaIji9zUtBkBbbjCSs=; b=imBnxzPv54U7Up1jZ2at3rW06MtuoAI2w85upWBA19kP+7mXUnoPx6oU9Bo6/i6pvC kYzt3XrNrDoSR9i8003HD5vGa0cCPv0K9ACti8xPbLc488fDEcbN0bBm9wsxVq8JRg8J Svgf3Fw32qzS4h3Jq05bCIeW8x2RhOc2wFuYD3k0vqtsXSA34vlKHWOzrH9XC8jss4CU FR13CCQ13W455wfCV39IENKYp6tWrLvCfv4jOyMqgSwyLkAEwd7uDWkzzk3ZyKDXBeVr 29IK7AV4B16USZtFHL+lm03sfZ0zez8rpr9rRorLIxbBmwG3z0k6z320ppg1JT3BuIE1 H+Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OvdZj+SFpT7mCy/KQvKHVvn4GvaIji9zUtBkBbbjCSs=; b=KjGfPgqmsmw+s44ZUHjhTq6KGj4AZE3xjpwZBu/XT2oib7ddFpi+/qfHPoYf4DVk2M TaLnRCuhYY36wXfswzSgyAsKKuyxuNsHv52RJdijfKVnHoJovz/bW0Q5as/I5bpi7+Da /yEaUM8xdJ70Sb2gNkBuHN3hz8O1lQ+4F23j81jx7mCGMEGO/J9tGuvb9bvdbQtFf9+d ITnm6LAeelGlZvJxWrWHZBMqu3yd0eVbLN0/2vYxtQs2m0aBUR6wYR0cy4JCS/M9CWiA fuRFCOwJu6PtPlHVOVbRURaCleNTrHXgT9pdcfye6jKbEfdTzmLMeYKbEX+rLqnlhYu0 vVvg== X-Gm-Message-State: APjAAAVHzh6zWbEDjDw7gBeZFWVIOTGldZbWUXqgKClaAiNBUv4Q/hMk ASOXDlTsKCk1KZoST2RpgCl8Wy81iYgOAQ== X-Google-Smtp-Source: APXvYqxIK9R8wA1h3CpJmfcx+dpoPxJd1HnXlFeEh0geajAgwW6wNgMNESNZLJxIbETJtVH91cgnoQ== X-Received: by 2002:ac8:23c5:: with SMTP id r5mr55818442qtr.319.1563908507851; Tue, 23 Jul 2019 12:01:47 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id p23sm20579571qke.44.2019.07.23.12.01.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00043r-8D; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 01/19] rdmacm: Fix missing libraries on centos6 build Date: Tue, 23 Jul 2019 16:01:19 -0300 Message-Id: <20190723190137.15370-2-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Build fails with: CMakeFiles/rdmacm.dir/rsocket.c.o: In function `rs_time_us': /home/jgg/oss/rdma-core/librdmacm/rsocket.c:449: undefined reference to `clock_gettime' Need to have -lrt on this old glibc. Fixes: 38c49232b67a ("rsockets: Replace gettimeofday with clock_gettime") Signed-off-by: Jason Gunthorpe --- librdmacm/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/librdmacm/CMakeLists.txt b/librdmacm/CMakeLists.txt index 4f74d4b0ac3b79..b306841ea2134e 100644 --- a/librdmacm/CMakeLists.txt +++ b/librdmacm/CMakeLists.txt @@ -21,6 +21,7 @@ target_link_libraries(rdmacm LINK_PUBLIC ibverbs) target_link_libraries(rdmacm LINK_PRIVATE ${NL_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} + ${RT_LIBRARIES} ) # The preload library is a bit special, it needs to be open coded From patchwork Tue Jul 23 19:01:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055173 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 57FC314DB for ; Tue, 23 Jul 2019 19:01:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 490C128720 for ; Tue, 23 Jul 2019 19:01:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D7DD2872E; Tue, 23 Jul 2019 19:01:51 +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 DC66528724 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391637AbfGWTBt (ORCPT ); Tue, 23 Jul 2019 15:01:49 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:46110 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391653AbfGWTBt (ORCPT ); Tue, 23 Jul 2019 15:01:49 -0400 Received: by mail-qt1-f194.google.com with SMTP id h21so42888149qtn.13 for ; Tue, 23 Jul 2019 12:01:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3EqDChbKkzRP/kkIXXxca7ygw4tAja1zmZyruAsHAvU=; b=oTIcjnGsggk8W9LcbolM/i2hsh7PeL6D29qg93GmXDghMxUWcBN/+EnXA/uWCeGa4Y sVOkLlCoeIFjrqbsGiAOeSqjSN2Awo/z3+bBdViNVAy8YPEQYJmaP7RcGSeCAcqbP8uj //xwIIZSJl2kQm3pNDw+2EcPOxIe0NJ8z7LwmGOll1xN3AMI1cJXERrKVP/fTI+Eyzy1 yvqwmBqH3v1U+ks3bcCn0n5c7RIaozj+KfUG9279AEx1C3sBoWtQnStZHgKr16Ahj+L+ Vvknv7x82UqsqQmBBXduMTGgb4JT/f69KSSnUpHzWy7csF0mvehz4SLueW5bLrRDzuAW 1n8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3EqDChbKkzRP/kkIXXxca7ygw4tAja1zmZyruAsHAvU=; b=uHXzef00uPRhysjGr7bxbaRris3RL1tsqjlFDV2U+sfb7mZdlY5sBFhpX1EcKaD8PB aEH4hixCHbZgFaX1IJvxHZM+y7jRISsoyw5JKzF5baaqcBOqoj7dOty3QkJMrFv7Wn7Z t4SET44jAqgc6qQpBGtuX0Wyhs4wr5qLBhvEEKLvFkJd04HaF8tuCfIQM9owF9b5AVAR ZHlfkj21Xbv0qnoZzdu1iLXQwJm/YkvyRSZI99JsuDX7HNr+F1hWUvkU5gaP/ARDzfeR za3KjpajDMuiBv+d63FZYtqGx75g2nbdUcYbM9N/AnWfFR7lkJ8o6oZjT7YSsyTmAZhR /FOA== X-Gm-Message-State: APjAAAWN3yI4a4e/JEZiPHURoiN7EVIE+CDXNP+TIpLirArp6Ib5G8T8 gEDPs9chSz1z2U/51x+/hCW6tBPwOEeFyQ== X-Google-Smtp-Source: APXvYqy/LX/2E3GTLX4O9/ewRjcjD8hDJLDoIL/DfEesV3wfOQH+9QTNAnAd2HC3XKnClfka1FTpBg== X-Received: by 2002:ac8:1750:: with SMTP id u16mr51649419qtk.90.1563908508134; Tue, 23 Jul 2019 12:01:48 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id d23sm18627126qkk.46.2019.07.23.12.01.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:42 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00043x-AL; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 02/19] util: Enable uninitialized_var on powerpc Date: Tue, 23 Jul 2019 16:01:20 -0300 Message-Id: <20190723190137.15370-3-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe For some reason the gcc 8/3 build for powerpc behaves differently from AMD64 and ARM64: ../providers/mlx4/qp.c: In function 'mlx4_post_send': ../providers/mlx4/qp.c:478:22: warning: 'ctrl' may be used uninitialized in this function [-Wmaybe-uninitialized] ctrl->owner_opcode |= htobe32((qp->sq.head & 0xffff) << 8); Signed-off-by: Jason Gunthorpe --- util/compiler.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/compiler.h b/util/compiler.h index 16f5ee14be2a8a..dfce82f1884149 100644 --- a/util/compiler.h +++ b/util/compiler.h @@ -7,9 +7,10 @@ This is only enabled for old compilers. gcc 6.x and beyond have excellent static flow analysis. If code solicits a warning from 6.x it is almost - certainly too complex for a human to understand. + certainly too complex for a human to understand. For some reason powerpc + uses a different scheme than gcc for flow analysis. */ -#if __GNUC__ >= 6 || defined(__clang__) +#if (__GNUC__ >= 6 && !defined(__powerpc__)) || defined(__clang__) #define uninitialized_var(x) x #else #define uninitialized_var(x) x = x From patchwork Tue Jul 23 19:01:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055195 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 30BB96C5 for ; Tue, 23 Jul 2019 19:11:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 213BE28684 for ; Tue, 23 Jul 2019 19:11:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1598628732; Tue, 23 Jul 2019 19:11:40 +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 BB52228684 for ; Tue, 23 Jul 2019 19:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729555AbfGWTLj (ORCPT ); Tue, 23 Jul 2019 15:11:39 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:45405 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729398AbfGWTLi (ORCPT ); Tue, 23 Jul 2019 15:11:38 -0400 Received: by mail-qk1-f193.google.com with SMTP id s22so31952268qkj.12 for ; Tue, 23 Jul 2019 12:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=87P5WFocleGvD2O2qMV/feWCHz3XYiwRpTioiMBhAAo=; b=nWdCiu9T2QYKLRgouKh9b77PDMUV56+Ye+JHs8Ec0NQYA06TlzJzWbLg/+PsY0xK/p KDiZhdZGt+NQzCWNZ4r5gXbmPFRO/YS9Cv58zXEZ5X8adYVddX21IzN6J0lccRcNQiB6 CI5abnN5XonwJxdIXaqVBNE4Duv/H0rc5LUVrdl/CKo9oX+89+Xklb2aSrpTKzeJuNYG S+fVtRSqUTFaUO64tkThAy4QTsorDEQE6m08RE+48nBOj8YkJUvdBsNV7Ovv0hvKxf/m Fpor0K+kdFMNIDPUA2x6F8S/zNARRjg09PzcAIvSmr0n7ds/q0BMKTRhQhNZs71KQd8k nhcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=87P5WFocleGvD2O2qMV/feWCHz3XYiwRpTioiMBhAAo=; b=ukiyH+dvItygsMbTbF2A2ChsthbvqtHV7wW48Dw/JCUuCz2+zE1aB8j2+12bMfYEk8 YHy61cScw/eVHWHe4DfnBHRM90Lwekch8N5cLmTBg17yZ5EUPJIKHwcnJDZRTDfeO2BY spDmRS0Mn6OqmBWQF4kK5+TIK2+VBfW1XiNrv8MEmX0k1I//15l+Z59A+QPu/bUQDhaL oKLBhkwsEZuOfBOrkCPP+Hd8C7AZol9eTFVvaG2LPCinnIMJYAoSw4mjGR6jXVNOZcw/ DpRNP1+d6+sGZuJThWPoLLxAwZNzcT3k7YBtaRTfbib56C/melh0Lq+R16Hu71Msi1bf 3bJg== X-Gm-Message-State: APjAAAUwlfpAcq64tps2aPrMvb3u/1NZtuukaTFBq94ox0upcRgY8lAV iXlMBOIDo9X1VJ39UF3EUiObr1C10FRyPg== X-Google-Smtp-Source: APXvYqyNyQM9dLjqsKFAw1Z0NrxOktAl8gQ2nXjcP56/yEjKBHexvdKx0S7Hhz4sE6ECU6ZIIE8G7w== X-Received: by 2002:ae9:e411:: with SMTP id q17mr48933653qkc.465.1563909097826; Tue, 23 Jul 2019 12:11:37 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id n27sm13864570qkk.35.2019.07.23.12.11.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:37 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-000443-Bc; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 03/19] build/cbuild: Remove docker-gc Date: Tue, 23 Jul 2019 16:01:21 -0300 Message-Id: <20190723190137.15370-4-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe This is now part of standard docker via the command: docker system prune Signed-off-by: Jason Gunthorpe --- buildlib/cbuild | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/buildlib/cbuild b/buildlib/cbuild index 83ada8ee44aa5e..7f93baa82b1959 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -1084,20 +1084,6 @@ def cmd_make_dist_tar(args): with open(os.path.join(args.script_pwd,args.tarfn),"w") as F: subprocess.check_call(["gzip","-9c",tmp_tarfn],stdout=F); -# ------------------------------------------------------------------------- -def args_docker_gc(parser): - pass; -def cmd_docker_gc(args): - """Run garbage collection on docker images and containers.""" - - containers = set(docker_cmd_str(args,"ps","-a","-q","--filter","status=exited").split()); - images = set(docker_cmd_str(args,"images","-q","--filter","dangling=true").split()); - - if containers: - docker_cmd(args,"rm",*sorted(containers)); - if images: - docker_cmd(args,"rmi",*sorted(images)); - # ------------------------------------------------------------------------- if __name__ == '__main__': From patchwork Tue Jul 23 19:01:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055191 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 F2A176C5 for ; Tue, 23 Jul 2019 19:11:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E509428684 for ; Tue, 23 Jul 2019 19:11:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D9A022872E; Tue, 23 Jul 2019 19:11:36 +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 7EC3328684 for ; Tue, 23 Jul 2019 19:11:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728990AbfGWTLf (ORCPT ); Tue, 23 Jul 2019 15:11:35 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:32932 "EHLO mail-qt1-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLf (ORCPT ); Tue, 23 Jul 2019 15:11:35 -0400 Received: by mail-qt1-f176.google.com with SMTP id r6so38758499qtt.0 for ; Tue, 23 Jul 2019 12:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uGkCjNnRJdgtLT8p4FzZezeOKVGZ7cf/IilSZq7RXO0=; b=a3xKv99dd7prErqSscRZqZJWDex6faroCxZlpQAFmFAohL7wPzpPw2FcBKLgY66Jt8 r4YQBXnTG4N0ZpT6ZZ0UazOiSlDwxB9C1WU/P/0V35Ufmj7xHLmKjq4653K4KXrGCHfQ YF2qFXXDY/2dLAfcZzIWmOAsn6NSOt0+uNrvi3ZTE/RMTIfVSXD+XIxByPGODUX5R6Sw 6cIraPMWeBUzcvu0EQJGXMy4iEjaPOC93JXJ7TMekBf7PstgeY6pI5xdBCN7DvXbJi27 zXaZW0mkCcEGQKW8IK9/GW3KGEfoTGwRpR44Ahcl3I19xQKJUow2Bw1bEPJUYkYXenKm 6dIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uGkCjNnRJdgtLT8p4FzZezeOKVGZ7cf/IilSZq7RXO0=; b=cDu2KkvF2BzTNPtWQWgl2GMbgsv5WB8e8notlzSe7H55sE/+0jhkp2lHP3qfIN8CTg ltuZaYLl4DZyOJ3Y1Uon8fNXqKrm1y/4mOei0LQQqcv4f8Mwp7f/OK4e91AhjnNWdJJL QIBadyUZ87xNEGEiV9LI8Z6JL2Q4xMK37kY2BTqnlN65b+OEyKFDR1WSvJz8Q+CP8Yns /ZpxUTdzDxwse8yD1Hl8Myt3b6rnwWnTSO64Ov01Qjy8fytvbsZidPgkqBeLWruxipJ7 oRfCXHAa/2XYNlxsqISpVqhX2YDzREB3aYYUV9IzM9qExN8XcQfHoXog/Dl3RN5Y71ee N6oA== X-Gm-Message-State: APjAAAW5wUoJc+homu6eCqD3xLAHznMTkjWZIqs9/aetCDMhnydOw6BO cPYLFO/UEhHlnXSZyQmAfewkeeP1g6yN8w== X-Google-Smtp-Source: APXvYqyxaacbIg3mwL22nDvhWCU1WqsWdvF90elFt99vO1IA1Cz1A3jXcb+dTSMphgDy1h9mFPT1Yg== X-Received: by 2002:ad4:5405:: with SMTP id f5mr55913277qvt.242.1563909094556; Tue, 23 Jul 2019 12:11:34 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id e1sm21881146qtb.52.2019.07.23.12.11.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:34 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-000449-D9; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 04/19] build/travis: Do not build packages in travis anymore Date: Tue, 23 Jul 2019 16:01:22 -0300 Message-Id: <20190723190137.15370-5-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe AZP does this now and (so far) doesn't randomly fail. Signed-off-by: Jason Gunthorpe --- .travis.yml | 4 ---- buildlib/package-build-test | 21 --------------------- 2 files changed, 25 deletions(-) delete mode 100755 buildlib/package-build-test diff --git a/.travis.yml b/.travis.yml index 1cc2c69ca8671d..23226a679acb6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,9 +39,6 @@ addons: - python3-dev - python3-pip -service: - - docker - before_script: - export LATEST_GCC_LINARO_URL=`wget -qO - https://releases.linaro.org/components/toolchain/binaries/latest-7/aarch64-linux-gnu/ | grep -o '/dev/null); then - echo "We are running in a container, skipping ..." - exit 0 -fi - -for OS in centos7 leap -do - echo - echo "Checking package build for ${OS} ...." - echo - buildlib/cbuild build-images ${OS} - buildlib/cbuild pkg --use-prebuilt-pandoc --with static ${OS} -done From patchwork Tue Jul 23 19:01:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055171 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 DA22F746 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA73728720 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BEE1B28736; Tue, 23 Jul 2019 19:01:50 +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 22EFE2872E for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391640AbfGWTBt (ORCPT ); Tue, 23 Jul 2019 15:01:49 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:38195 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391643AbfGWTBs (ORCPT ); Tue, 23 Jul 2019 15:01:48 -0400 Received: by mail-qk1-f193.google.com with SMTP id a27so31922994qkk.5 for ; Tue, 23 Jul 2019 12:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UKmdwvw/8ttn78/lBaV+bKRv55wjOH8lCAZy5e7wk/Y=; b=J7qUhNen3Dz157dE2Ng4CmMJ5GsktjzuBk0xwqCsq7Gg0fu8uM2iULT2VTyInspP8j qjfNqQlLwC+tSfmxldjXQat/ys31GWvcBP89uQX9ANmqRyqN0y56axjNw3QpGBmr31E0 AcbJZsLhB6p+VJzVtog0FX96AqpuQ5pDPxd4md2/HtEl8FKlG2AHzCxKsfIyG+VgZfG/ LVPAHJSfKK2GyyBzpK3rZiP4ZRoz9p5Ib/Ic3dB6lJpuqzPBuJBFQ7ciH0ipeeeWRQtb jTxafsXUg9ADuWu+QYyAQd6x1NuC0UqYdxamfyN8ZCxLITW2yS6frBomryB4LKrW1LbX rEZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UKmdwvw/8ttn78/lBaV+bKRv55wjOH8lCAZy5e7wk/Y=; b=IEqLEKpoEV9cikLpxsND20OKvrHU/Lh++qSljEvpubPO4AQi+QentBBbHouPbGtRfM g3W12EfmgaSNyK98jkhmwg2poKlUz1okIy89NQFVLraFsl67+jJ/TMjTNOK8BokcH8Ky qdyKlB6Sk8kJIEbkzF+6NUHr7FO1+M0Uy2OGyKQv6FF2qzE1EhHfGoTMWg6cNfQpj+CI PtuTTXKTEbdoRzv1QwiX+b7jpWvRoMsN28bi00HY8pdpvlPr2D19QtGHiygOpq9/IW2E cR4zTl048go8pebNOMH6haU1uFc/b0/LY7n2i55/+rF3rJxHSPLbpMZMTYtkLcwvLt81 laKQ== X-Gm-Message-State: APjAAAXDdZDPkVRgCNZ0uxHizMh+LWvQfXu4NTcBh8CDxOabesTxxoo8 aLzDsxjBs8IINacdXc9fzdRbaHY19c4FxQ== X-Google-Smtp-Source: APXvYqwG4XPp3FH/0xpUjVyxR2/hZmH0XFLnyWl9ztKjsNcfiTrhqbtdWPBZq806poL8TNUbJNyszw== X-Received: by 2002:a37:274a:: with SMTP id n71mr47384474qkn.448.1563908507213; Tue, 23 Jul 2019 12:01:47 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id m44sm24417261qtm.54.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044F-FD; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 05/19] build/travis: Do not run checkpatch Date: Tue, 23 Jul 2019 16:01:23 -0300 Message-Id: <20190723190137.15370-6-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe AZP does this now and shows the results in a much clearer way. Signed-off-by: Jason Gunthorpe --- .travis.yml | 1 - buildlib/travis-checkpatch | 30 ------------------------------ 2 files changed, 31 deletions(-) delete mode 100755 buildlib/travis-checkpatch diff --git a/.travis.yml b/.travis.yml index 23226a679acb6b..d20dadf8e9d90f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,7 +48,6 @@ before_script: - http_proxy= pip3 install cython script: - buildlib/travis-build - - buildlib/travis-checkpatch - buildlib/github-release deploy: # Deploy assets to Github releases diff --git a/buildlib/travis-checkpatch b/buildlib/travis-checkpatch deleted file mode 100755 index 5e78ec47406210..00000000000000 --- a/buildlib/travis-checkpatch +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -# Copyright 2017 Mellanox Technologies Ltd. -# Licensed under BSD (MIT variant) or GPLv2. See COPYING. - - -if [ "x$TRAVIS_EVENT_TYPE" != "xpull_request" ]; then - # Peform checkpatch checks on pull requests only - exit 0 -fi - -# The below "set" is commented, because the checkpatch.pl returns 1 (error) for warnings too. -# And the rdma-core code is not mature enough to be warning safe -# set -e - -if [ "x$TRAVIS_COMMIT_RANGE" != "x" ]; then - cd buildlib/ - wget -q https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/scripts/checkpatch.pl \ - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/scripts/spelling.txt - DIR_FOR_PATCHES_TO_CHECK=$(mktemp -d) - git format-patch --no-cover-letter $TRAVIS_COMMIT_RANGE ^$TRAVIS_BRANCH -o $DIR_FOR_PATCHES_TO_CHECK/ - CHECKPATCH_OPT="--no-tree --ignore PREFER_KERNEL_TYPES,FILE_PATH_CHANGES,EXECUTE_PERMISSIONS,USE_NEGATIVE_ERRNO,CONST_STRUCT $DIR_FOR_PATCHES_TO_CHECK/*" - perl checkpatch.pl $CHECKPATCH_OPT - if [ $? -ne 0 ]; then - # We rerun checkpatch to simplify parsing and to understand if we failed for errors - # For example, the output on some arbitrary patchset of the following line without awk is: - # total: 1 errors, 3 warnings, 42 lines checked - NUMB_ERRRORS=$(perl checkpatch.pl --terse $CHECKPATCH_OPT | awk 'BEGIN {FS = "total:"} ; {sum+=$2} END {print sum}') - exit $NUMB_ERRRORS - fi -fi From patchwork Tue Jul 23 19:01:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055167 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 9B70714DB for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E81528720 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82ECA28737; Tue, 23 Jul 2019 19:01:50 +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 542B028720 for ; Tue, 23 Jul 2019 19:01:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391641AbfGWTBq (ORCPT ); Tue, 23 Jul 2019 15:01:46 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:37326 "EHLO mail-qk1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726621AbfGWTBq (ORCPT ); Tue, 23 Jul 2019 15:01:46 -0400 Received: by mail-qk1-f177.google.com with SMTP id d15so31894625qkl.4 for ; Tue, 23 Jul 2019 12:01:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zIff7Uf/Rm++2DAFA4aFIst6xKKCYsuK2JlZRwYIiV0=; b=ZoTMFRE6E1QqjALDSl3Vzsq06OwMy5Op2boo7s9Zcd88/kglvHp/aCaiuPj/CyfvVE PODZLwbNJ3ktVyovgjr6XjqmjTkvuSFh5S0uFeDbVxcFchROmrpvq30vXzBLf3V1flti euUbLsUimK8vo05fNPD6iQv//aYwxubm3obL26LJOyQCkyWyqOyNOZ9x6ZDBXspC1X1h aVUV4kun3Q9xetL2eKkcfHW0dCQZzYaTCrtnLiCR8qnvaRcBqCnR4h5yh0OEb7LBtIV2 ot1lOelzW4EBzTjrq9uF50mCEHF4KgaLYaArczD9wCPRbz/XYfYaTOdWYUiKhhSWPLWm GmWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zIff7Uf/Rm++2DAFA4aFIst6xKKCYsuK2JlZRwYIiV0=; b=DjJiMoRY/vO9Hx14iHOWzzzfknsWZmNSoPXwaD2nT8grBHyrSTO9nzfrsw5YruHS9K CMjVi7ryP/LcgaRlkDs43QPytu6OS4+kLgmCmQLkMblIiRp1VctXaT9vTir9imqyuW8D 33x1P4k1jiC0sGJB8+P4aJWoHYVnu7mr/OdvGekGBXqgi3100UQ1oOP1/x4RRjL8Xwpn P5Njw0QxN9g+0u9bwWQ452EoaQDPtBSc7lmHdzOlFyaYOp8hSr8KoxpGQmJgyKx4o1Kl gzJnXj897+kNKmTPOt+iHdvbK2DwMJl00OOGNcWXDbiPRWlxcKFt0PEU04H/Dh+atlKP 0VqA== X-Gm-Message-State: APjAAAVvBaMxekT/gI0s1oxwcBtLj/ubZh+y628//XqAw3oqP1pb1Gof usl+/gjEzo5gnYk/xL6pVz/NpWkwZvFKpg== X-Google-Smtp-Source: APXvYqy7rsXReobd71JTKN7vf0W+8crIKL4YTvTYn5d1nXRinGFTXnDNiidUgB1Jwcac0T5/fg31dA== X-Received: by 2002:ae9:e856:: with SMTP id a83mr48812326qkg.321.1563908504820; Tue, 23 Jul 2019 12:01:44 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id i23sm19591095qtm.17.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044L-Go; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 06/19] build/travis: Do not cross compile for ARM64 Date: Tue, 23 Jul 2019 16:01:24 -0300 Message-Id: <20190723190137.15370-7-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe AZP does this now, and does a better job as it has all the cross compile system libraries available. Signed-off-by: Jason Gunthorpe --- .travis.yml | 5 ----- buildlib/travis-build | 7 +------ 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index d20dadf8e9d90f..82f16d65e0a646 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,6 @@ addons: - python3-pip before_script: - - export LATEST_GCC_LINARO_URL=`wget -qO - https://releases.linaro.org/components/toolchain/binaries/latest-7/aarch64-linux-gnu/ | grep -o ' X-Patchwork-Id: 11055165 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 1F09D6C5 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 109FF28724 for ; Tue, 23 Jul 2019 19:01:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0507128735; Tue, 23 Jul 2019 19:01:50 +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 8722D28724 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391652AbfGWTBs (ORCPT ); Tue, 23 Jul 2019 15:01:48 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:42491 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391640AbfGWTBs (ORCPT ); Tue, 23 Jul 2019 15:01:48 -0400 Received: by mail-qk1-f193.google.com with SMTP id 201so31890180qkm.9 for ; Tue, 23 Jul 2019 12:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cE2YmJOoUvJi6N4PcPWSBx7RPu50opRPgii3QI4KFAw=; b=Ypck7+D0U1yItOkAPT0ChuzBPHCHQIsynQqVtwAaFPoNTwVd25zqygJ+L4CjBxTFtB pR1PNjIhG3RhOL6WMucGglRWvbpctGZIQA71781evLJfbH7gShdlq9wnde9w1G0k71bQ omEckzrJolglh54SS5h1HECqen6jBkMjoeQaIDjogjTiU/4s+bNgUwhtSYRjylfQx8Sj ptg/s8KtjJSmRhhCEBd+52rlBJzCYiVCsNIXDpOwel2oVLulym6sfkoDi/8Bpsw9QWpi a/+8edLWDub/PQ8QWOU71OY39xEG89lUu/RLi6ufRKekcRBsVT2ZM9AuIYqi5GgcsQdG RIyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cE2YmJOoUvJi6N4PcPWSBx7RPu50opRPgii3QI4KFAw=; b=OLkO8k8EMQu1qnIGKDW7c2EvtJ+c7RkiGjm1f62H+uuW5LxLzT2D/sbctkLJyyIi0P 7THbGSXuDwLbZWxU+5syAOybVkopFZM5NpdqpV4ixSFDLKjZTIH8aXp0FzkwulwJHrfQ fhpY6ZdsuNQgfnk6mTVhvTDadTfsGpzKrA8VoO/nHJGJkIO9D9MsH4QmxHFeFK7UA2k3 NigTkHxdZJZQ61YwdBIo/gy1pCjNrm/7COR5whdYvZMo7x/MmQFMxzg1hfJT6X6g8r8J w+OzjQ5RK1EkTHpmyAJRr7pCLDG1gfqUwuy/JIqvbjeixdcNvbY5hd2wjf4BDH6yYQBd 7PNg== X-Gm-Message-State: APjAAAX4oCWhMYBpoqT0Gb3HBK0PTvbiMGHYJVsTctpZqp3iu9LBDoq6 XxuKzMcbSW9MHgU54X4kOis42eEiXEoRQQ== X-Google-Smtp-Source: APXvYqxLqTbthcMrrkkFC7+zoxkntGtNqarkvs+JMTVvr3pBka5EiPgQyBLNR10HgL7a8u6VaWocpg== X-Received: by 2002:a37:8604:: with SMTP id i4mr50512960qkd.255.1563908506600; Tue, 23 Jul 2019 12:01:46 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id o5sm19396466qkf.10.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044R-I5; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 07/19] build/azp: Use a version number for the docker images Date: Tue, 23 Jul 2019 16:01:25 -0300 Message-Id: <20190723190137.15370-8-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe This way when we make a stable branch the CI container images will remain unchanged for that branch instead of tracking the master branch. If incompatible changes are made during a release then a suffix should be appended. The version number for the image is taken from the buildlib/azure-pipelines.yml. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 6 +++--- buildlib/cbuild | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 998b598bfc482f..e1ed19c6e7ad93 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -8,13 +8,13 @@ pr: resources: containers: - container: azp - image: ucfconsort.azurecr.io/rdma-core/azure_pipelines:latest + image: ucfconsort.azurecr.io/rdma-core/azure_pipelines:25.0 endpoint: ucfconsort_registry - container: centos7 - image: ucfconsort.azurecr.io/rdma-core/centos7:latest + image: ucfconsort.azurecr.io/rdma-core/centos7:25.0 endpoint: ucfconsort_registry - container: leap - image: ucfconsort.azurecr.io/rdma-core/opensuse-15.0:latest + image: ucfconsort.azurecr.io/rdma-core/opensuse-15.0:25.0 endpoint: ucfconsort_registry stages: diff --git a/buildlib/cbuild b/buildlib/cbuild index 7f93baa82b1959..1c325c9fe7cbdf 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -52,6 +52,7 @@ import shutil import subprocess import sys import tempfile +import yaml from contextlib import contextmanager; project = "rdma-core"; @@ -72,6 +73,7 @@ class DockerFile(object): self.lines = ["FROM %s"%(src)]; class Environment(object): + azp_images = None; pandoc = True; python_cmd = "python3"; aliases = set(); @@ -81,9 +83,23 @@ class Environment(object): to_azp = False; + def _get_azp_names(self): + if Environment.azp_images: + return Environment.azp_images; + + with open("buildlib/azure-pipelines.yml") as F: + azp = yaml.safe_load(F) + Environment.azp_images = set(I["image"] for I in azp["resources"]["containers"]) + return Environment.azp_images; + def image_name(self): if self.to_azp: - return "ucfconsort.azurecr.io/%s/%s"%(project, self.name); + # Get the version number of the container out of the azp file. + prefix = "ucfconsort.azurecr.io/%s/%s:"%(project, self.name); + for I in self._get_azp_names(): + if I.startswith(prefix): + return I; + raise ValueError("Image is not used in buildlib/azure-pipelines.yml") return "build-%s/%s"%(project,self.name); # ------------------------------------------------------------------------- @@ -252,7 +268,6 @@ class travis(APTEnvironment): _yaml = None; def get_yaml(self): - import yaml if self._yaml: return self._yaml; @@ -394,6 +409,7 @@ class azure_pipelines(bionic): "gcc-8", "git", "python2.7", + "python3-yaml", "sparse", 'python-docutils', } | { @@ -750,7 +766,6 @@ def copy_abi_files(src): shutil.copy(cur_fn, ref_fn); def run_travis_build(args,env): - import yaml with private_tmp(args) as tmpdir: os.mkdir(os.path.join(tmpdir,"src")); os.mkdir(os.path.join(tmpdir,"tmp")); @@ -815,7 +830,6 @@ def run_travis_build(args,env): copy_abi_files(os.path.join(tmpdir, "src/ABI")); def run_azp_build(args,env): - import yaml # Load the commands from the pipelines file with open("buildlib/azure-pipelines.yml") as F: azp = yaml.safe_load(F); From patchwork Tue Jul 23 19:01:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055155 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 17531746 for ; Tue, 23 Jul 2019 19:01:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0897528720 for ; Tue, 23 Jul 2019 19:01:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F0D4E28725; Tue, 23 Jul 2019 19:01:46 +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 DBE7528720 for ; Tue, 23 Jul 2019 19:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726715AbfGWTBp (ORCPT ); Tue, 23 Jul 2019 15:01:45 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:46095 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726621AbfGWTBp (ORCPT ); Tue, 23 Jul 2019 15:01:45 -0400 Received: by mail-qt1-f193.google.com with SMTP id h21so42887924qtn.13 for ; Tue, 23 Jul 2019 12:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dfl71m/NsNfbA8WM2LSOzoDmgIsqi5BgwE8JCMzyrSk=; b=RW7azUJziMmcZhJesmHWpu34IKQ/fJMc1JvkNVHTaNXLCyY5fR7r3uchFqOZmsgRyl xgSJ1+88F8k2tXTEHXY27L9z7mWrJ4gTt6KgGgbRVJQQ6UlEJBZXnT0Twl+dWupcCnU4 aI1E/AvTAgipukkIvikuqiS6/MuMwaa0Bz4asSX3hc3WmtCZDFdk++tOYglvz+qN1ucn AsOaSts8ZI1/E+KakO/i/gR1hnEeoZKnHRMIEx+izpO4nRcmAlF5tetDQTtWqQsT62lj SxoGPV00nTy7KG2O23K8JZ0tVP1B9hLA8VNdERe/7IXs3Co6A0Lnr/ht8PjQjBNDS3AK e9yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dfl71m/NsNfbA8WM2LSOzoDmgIsqi5BgwE8JCMzyrSk=; b=AYdkHtZ6ZoS+rPLNKlgGDIrTRe/r94gTlZhvqUUGR8XZV4rQunCBGTylA5FmuFdMOz AOf8DhU2bikyo1UsS5BsI/W2Dj8rswXmlGUeLloqduhTLQGMC4RJisw2BCyemn8dwsnt o19LLL6SJ7U0xOedbxeDfqgZl89q+PoZxgy5YvJlCKFSJYrevESE6HNySjBeVHdlrvgV rhcX4V6cPHs4mJKWjBwftUalrZxk0L/4u8/itI1V+zSuI5WU0Z5L1sYlFgkVmYFARLQS nrysPivLMoeEbvGqPnNpmgX4f0/pcUVUC2+q9ha61YWuc6UWvwaXyCATYpFLY8Oyi3Tv 4+LA== X-Gm-Message-State: APjAAAW2kd8TZoUNnmdj+UskFv+kui0bkUJwuSEo4RoMBhR6Q0awOFm1 ATywRMSVEYoJ5UKa6a/GLFs2CODUw5ER8A== X-Google-Smtp-Source: APXvYqz0kHT2VoJVq+hHfSt9oBwqeRAjnQgK0UI5SxfMNIvkw5A+9W45oVsI+XoJaknZ4b06S3G1Ww== X-Received: by 2002:ac8:2a99:: with SMTP id b25mr54940841qta.223.1563908504034; Tue, 23 Jul 2019 12:01:44 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id c5sm27505525qta.5.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044X-K5; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 08/19] build/cbuild: Add push-azp-images Date: Tue, 23 Jul 2019 16:01:26 -0300 Message-Id: <20190723190137.15370-9-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Do a parallel push of all the Azure Pipelines images to the container registry. Signed-off-by: Jason Gunthorpe --- buildlib/cbuild | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/buildlib/cbuild b/buildlib/cbuild index 1c325c9fe7cbdf..9fd51cc750dcbb 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -161,6 +161,7 @@ class centos7_epel(centos7): ninja_cmd = "ninja-build"; # Our spec file does not know how to cope with cmake3 is_rpm = False; + to_azp = False; def get_docker_file(self): res = YumEnvironment.get_docker_file(self); @@ -1059,6 +1060,29 @@ def cmd_build_images(args): tmpdir]); docker_cmd(args,*opts); +# ------------------------------------------------------------------------- + +def args_push_azp_images(args): + pass +def cmd_push_azp_images(args): + """Push the images required for Azure Pipelines to the container + registry. Must have done 'az login' first""" + subprocess.check_call(["sudo","az","acr","login","--name","ucfconsort"]); + with private_tmp(args) as tmpdir: + nfn = os.path.join(tmpdir,"build.ninja"); + with open(nfn,"w") as F: + F.write("""rule push + command = docker push $img + description=Push $img\n"""); + + for env in environments: + name = env.image_name() + if "ucfconsort.azurecr.io" not in name: + continue + F.write("build push_%s : push\n img = %s\n"%(env.name,env.image_name())); + F.write("default push_%s\n"%(env.name)); + subprocess.check_call(["sudo","ninja"],cwd=tmpdir); + # ------------------------------------------------------------------------- def args_make_dist_tar(parser): parser.add_argument("BUILD",help="Path to the build directory") From patchwork Tue Jul 23 19:01:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055159 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 52DDE6C5 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41FBB28724 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 306442874E; Tue, 23 Jul 2019 19:01:49 +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 3727B28724 for ; Tue, 23 Jul 2019 19:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391642AbfGWTBr (ORCPT ); Tue, 23 Jul 2019 15:01:47 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:42491 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391637AbfGWTBr (ORCPT ); Tue, 23 Jul 2019 15:01:47 -0400 Received: by mail-qk1-f195.google.com with SMTP id 201so31890138qkm.9 for ; Tue, 23 Jul 2019 12:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kEIIl/wHnLOY0XOMg6Gta0jA6ZWKKqlFmHhwlrFbhHY=; b=ERG0x6BlYQ3wrthNm01JBjnWPbln2kwpFZtHiThKcLeAIy8WOBq5GZAFr2mH91iAxZ 2AZ1v4FylxRg0CidjGq5O++kCMLRcjfdvTLV5jgwWqbWZ5f4enX0PI7qsv+PcgjLSkH4 WCeKbXFsbfJjSQOcmYap7IEeyFppa1TLCKV/xpvFakN4wlWKxE46AKD/sUtgfYAX8x7v V3VF2WZw/PcMOSEVdFt0ytTqe0Z/k12FcmPdF0tuCvFvE7xH9QWJw/OkoyEjVoRjQw+q RZtCdZgjrawo/K90YYg5vrF06bkPPUpEvGrXcTo5ydjf977opnRLjGmOh4JrUm7dRc0Y 3O6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kEIIl/wHnLOY0XOMg6Gta0jA6ZWKKqlFmHhwlrFbhHY=; b=EnEnqHFpR+1fX2aiKFx1/ip/eEBU5NVKb/DOTNgTNFU0M5juXfTu6k6kAHnfRwYsyA PStp+bCHqMzc458UAh5/iviPiJ+N2ERoG8P7WOxnccyIpcChgFX6zo6nbwcMqkUbOTjD I2dCRveKemyVewQ/V+N5QcUseco/tEWgsd4UGxRjUelBXE2SzNg97C7o8jojQVHGG8e8 n9rQ78VYb+FKR1RaXm1WCHz+Qrz7F5r4oSFDi3aMjFk/SYGMyE7jbvSYSIA2U8TJlyXN VN0Se07mgchZJmlE3x+bqwrcbShl+j34aWkwHrrLsK04ACWVt7V3GSP/svvYIwBDvw29 1KUg== X-Gm-Message-State: APjAAAWBLaahM0Om+Js+6olACDaQSJpwgdYcpN1xIt8YWoWrA0wD19+n v//6DHqS/Ad3yt93iJ07ONcvhGCyllipfg== X-Google-Smtp-Source: APXvYqzb56Gv8RtFmQewShAEaN/JW6QDMQCtkVs8KQACD9GF7LGZkln4rJWXVu5LGo5iPgeuiiE/sQ== X-Received: by 2002:a37:9c94:: with SMTP id f142mr46198995qke.427.1563908505322; Tue, 23 Jul 2019 12:01:45 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id n27sm13855159qkk.35.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044d-LK; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 09/19] build/azp: Use gcc 9.3 for building Date: Tue, 23 Jul 2019 16:01:27 -0300 Message-Id: <20190723190137.15370-10-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Latest release Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 18 +++++----- buildlib/cbuild | 69 ++++++++++++++++++++++++++---------- 2 files changed, 60 insertions(+), 27 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index e1ed19c6e7ad93..f488bfe607c482 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -35,16 +35,16 @@ stages: - bash: | set -e - mkdir build-gcc8 - cd build-gcc8 - CC=gcc-8 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 + mkdir build-gcc9 + cd build-gcc9 + CC=gcc-9 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 ninja - displayName: gcc 8.3 Compile + displayName: gcc 9.1 Compile - bash: | set -e - cd build-gcc8 - python2.7 ../buildlib/check-build --src .. --cc gcc-8 + cd build-gcc9 + python2.7 ../buildlib/check-build --src .. --cc gcc-9 displayName: Check Build Script # Run sparse on the subdirectories which are sparse clean @@ -75,9 +75,9 @@ stages: set -e mv util/udma_barrier.h util/udma_barrier.h.old echo "#error Fail" >> util/udma_barrier.h - cd build-gcc8 + cd build-gcc9 rm CMakeCache.txt - CC=gcc-8 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both + CC=gcc-9 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both ninja mv ../util/udma_barrier.h.old ../util/udma_barrier.h displayName: Simulate non-coherent DMA Platform Compile @@ -117,7 +117,7 @@ stages: set -e mkdir build-pandoc artifacts cd build-pandoc - CC=gcc-8 cmake -GNinja .. + CC=gcc-9 cmake -GNinja .. ninja docs cd ../artifacts # FIXME: Check Build.SourceBranch for tag consistency diff --git a/buildlib/cbuild b/buildlib/cbuild index 9fd51cc750dcbb..34051e55c24e81 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -106,7 +106,7 @@ class Environment(object): class YumEnvironment(Environment): is_rpm = True; - def get_docker_file(self): + def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); res.lines.append("RUN yum install -y %s && yum clean all"%( " ".join(sorted(self.pkgs)))); @@ -163,8 +163,8 @@ class centos7_epel(centos7): is_rpm = False; to_azp = False; - def get_docker_file(self): - res = YumEnvironment.get_docker_file(self); + def get_docker_file(self,tmpdir): + res = YumEnvironment.get_docker_file(self,tmpdir); res.lines.insert(1,"RUN yum install -y epel-release"); res.lines.append("RUN ln -s /usr/bin/cmake3 /usr/local/bin/cmake && ln -sf /usr/bin/python3.4 /usr/bin/python3"); return res; @@ -185,7 +185,7 @@ class fc30(Environment): is_rpm = True; aliases = {"fedora"}; - def get_docker_file(self): + def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); res.lines.append("RUN dnf install -y %s && dnf clean all"%( " ".join(sorted(self.pkgs)))); @@ -196,12 +196,39 @@ class fc30(Environment): class APTEnvironment(Environment): is_deb = True; build_python = True; - def get_docker_file(self): + def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); res.lines.append("RUN apt-get update && apt-get install -y --no-install-recommends %s && apt-get clean && rm -rf /usr/share/doc/ /usr/lib/debug"%( " ".join(sorted(self.pkgs)))); return res; + def add_source_list(self,tmpdir,name,content): + sld = os.path.join(tmpdir,"etc","apt","sources.list.d"); + if not os.path.isdir(sld): + os.makedirs(sld); + with open(os.path.join(sld,name),"w") as F: + F.write(content + "\n"); + + def add_ppa(self,tmpdir,srcline,keyid): + gpgd = os.path.join(tmpdir,"etc","apt","trusted.gpg.d"); + if not os.path.isdir(gpgd): + os.makedirs(gpgd); + + # The container does not have gpg or other stuff to get the signing + # key for the toolchain ppa. Fetch it in the host and just import the + # gpg data directly into the trusted keyring. + kb = os.path.join(tmpdir,"%s.kb.gpg"%(keyid)); + subprocess.check_call(["gpg","--no-default-keyring","--keyring",kb,"--always-trust", + "--recv-key",keyid]); + kr = os.path.join(gpgd,"%s.gpg"%(keyid)); + with open(kr,"wb") as F: + F.write(subprocess.check_output(["gpg","--no-default-keyring", + "--keyring",kb, + "--export",keyid])); + os.unlink(kb); + + self.add_source_list(tmpdir,keyid + ".list",srcline); + class xenial(APTEnvironment): docker_parent = "ubuntu:16.04" pkgs = { @@ -252,7 +279,7 @@ class debian_experimental(APTEnvironment): pkgs = (stretch.pkgs ^ {"gcc"}) | {"gcc-9"}; name = "debian-experimental"; - def get_docker_file(self): + def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); res.lines.append("RUN apt-get update && apt-get -t experimental install -y --no-install-recommends %s && apt-get clean"%( " ".join(sorted(self.pkgs)))); @@ -330,10 +357,10 @@ class travis(APTEnvironment): def get_cython(self): return ["""RUN pip3 install cython"""] - def get_docker_file(self): + def get_docker_file(self,tmpdir): # First this to get apt-add-repository self.pkgs = {"software-properties-common"} - res = APTEnvironment.get_docker_file(self); + res = APTEnvironment.get_docker_file(self,tmpdir); # Sources list from the travis.yml res.lines.extend(self.get_repos()); @@ -357,7 +384,7 @@ class travis(APTEnvironment): class ZypperEnvironment(Environment): proxy = False; is_rpm = True; - def get_docker_file(self): + def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); res.lines.append("RUN zypper --non-interactive refresh"); res.lines.append("RUN zypper --non-interactive dist-upgrade"); @@ -407,7 +434,7 @@ class azure_pipelines(bionic): "ca-certificates", "clang-7", "fakeroot", - "gcc-8", + "gcc-9", "git", "python2.7", "python3-yaml", @@ -415,7 +442,7 @@ class azure_pipelines(bionic): 'python-docutils', } | { # 32 bit build support - "libgcc-8-dev:i386", + "libgcc-9-dev:i386", "libc6-dev:i386", "libnl-3-dev:i386", "libnl-route-3-dev:i386", @@ -435,14 +462,20 @@ class azure_pipelines(bionic): name = "azure_pipelines"; aliases = {"azp"} - def get_docker_file(self): - res = bionic.get_docker_file(self); + def get_docker_file(self,tmpdir): + res = bionic.get_docker_file(self,tmpdir); + self.add_ppa(tmpdir, + "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main", + "60C317803A41BA51845E371A1E9377A2BA9EF27F"); + self.add_source_list(tmpdir,"arm64.list", + """deb [arch=arm64] http://ports.ubuntu.com/ bionic main universe +deb [arch=arm64] http://ports.ubuntu.com/ bionic-security main universe +deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates main universe"""); + + res.lines.insert(1,"ADD etc/ /etc/"); res.lines.insert(1,"RUN dpkg --add-architecture i386 &&" "dpkg --add-architecture arm64 &&" - "sed -i -e 's/^deb /deb [arch=amd64,i386] /g' /etc/apt/sources.list &&" - "echo 'deb [arch=arm64] http://ports.ubuntu.com/ bionic main universe\\n" - "deb [arch=arm64] http://ports.ubuntu.com/ bionic-security main universe\\n" - "deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates main universe' > /etc/apt/sources.list.d/arm64.list"); + "sed -i -e 's/^deb /deb [arch=amd64,i386] /g' /etc/apt/sources.list"); return res; # ------------------------------------------------------------------------- @@ -1047,8 +1080,8 @@ def cmd_build_images(args): """Run from the top level source directory to make the docker images that are needed for building. This only needs to be run once.""" for env in args.ENV: - df = env.get_docker_file(); with private_tmp(args) as tmpdir: + df = env.get_docker_file(tmpdir); fn = os.path.join(tmpdir,"Dockerfile"); with open(fn,"wt") as F: for ln in df.lines: From patchwork Tue Jul 23 19:01:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055161 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 57D73746 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A99F28723 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 48AF928748; Tue, 23 Jul 2019 19:01:49 +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 7474028723 for ; Tue, 23 Jul 2019 19:01:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726621AbfGWTBq (ORCPT ); Tue, 23 Jul 2019 15:01:46 -0400 Received: from mail-qt1-f178.google.com ([209.85.160.178]:36011 "EHLO mail-qt1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391640AbfGWTBq (ORCPT ); Tue, 23 Jul 2019 15:01:46 -0400 Received: by mail-qt1-f178.google.com with SMTP id z4so42982471qtc.3 for ; Tue, 23 Jul 2019 12:01:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zAcLiIDtMqGzReNRQfmKQ9kFL9wK5rZw0K8FPf3Fba4=; b=ZxPmjB7Yv3yBVDYZ/xJkgRHwwgtScxV/+MwRJcH0BZEUh+gFlvuNba7dsXU/aWg+f5 q569HCeXbtB0V68zuFymynUgpLXcu8uWlJCEJ/+TuBzke7yIL5PGDiQlsZHy8jVcccGp VAv28gG/UUPVso5nUDcsO2UkTAAJmjENkqa510KaGc6i3lQNAPNmpaIhksVhNxqjtMtF 2PkhmOMgux7EUbYJeTeCKA3R8/LS2qfCRPAxj5OMH2KJ+KHa/IqfqOMWQ7pn05gGHTHM 8mrpYnb7JKecOzsDxwsbmGYqGizbX1LUiIEq5xY2a9SVhZgboeqCZR5VIwB8TwKxuwNA N2dw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zAcLiIDtMqGzReNRQfmKQ9kFL9wK5rZw0K8FPf3Fba4=; b=XkJ8XBtISsN/6+4N3deH+Gz49u88rfEM7GiTuuNEJRS1Dmy9Mtt7/dQpV8wQMehkub FtWdV0ZjtAsZZTj668nLSUCcSTfoLHcVoDrU1eu93WfqPl7dXh5ihbJnhAL4skkOXhxE Fmqmd1UBhqtH7CgJi4bmfNXfhyXXW6VwgovevdkyNn3Y79AwlP6qjHNE2AptARW4fPN+ bZ52SER9iJXq/V4pr2e/jiXLrrUV39Yj9Zx4Op4UlRurgpHtbtZ7vjvlf7Tceucg9z81 AAFUI6z0w2OOa7+YWWFJ5cjB0thZ5Yg7saETV5cFPZn+jodehKpodyGDxdF1O2sQGWV2 b1uw== X-Gm-Message-State: APjAAAUEZjsU57e55eAzZLrbZxgME4g/hOSs/P7b0X2lo+SsFB9Vcthe 0hgTwIx6GwLX7lM+hrIa4xtz4ckLFK2QnA== X-Google-Smtp-Source: APXvYqw9UfFEP4Y97eiyMHktWPFMwCIBSSqBkkt9VvvXLejgne3Mo8cEx5BppFp18Ty1QymAALOSxQ== X-Received: by 2002:ac8:1195:: with SMTP id d21mr19455787qtj.278.1563908505595; Tue, 23 Jul 2019 12:01:45 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id s7sm19061254qtq.8.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044j-MR; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 10/19] build/azp: Use clang 8.0 for building Date: Tue, 23 Jul 2019 16:01:28 -0300 Message-Id: <20190723190137.15370-11-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Latest release Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 10 +++++----- buildlib/cbuild | 5 ++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index f488bfe607c482..f6f71ac0adfa42 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -67,9 +67,9 @@ stages: set -e mkdir build-clang cd build-clang - CC=clang-7 CFLAGS="-Werror -m32 -msse3" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + CC=clang-8 CFLAGS="-Werror -m32 -msse3" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 ninja - displayName: clang 7.0 32-bit Compile + displayName: clang 8.0 32-bit Compile - bash: | set -e @@ -97,12 +97,12 @@ stages: echo 'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")' >> buildlib/RDMA_EnableCStd.cmake sed -i -e 's/-DCMAKE_BUILD_TYPE=Release/-DCMAKE_BUILD_TYPE=Debug/g' debian/rules sed -i -e 's/ninja \(.*\)-v/ninja \1/g' debian/rules - debian/rules CC=clang-7 build - displayName: clang 7.0 Bionic Build + debian/rules CC=clang-8 build + displayName: clang 8.0 Bionic Build - bash: | set -e fakeroot debian/rules binary - displayName: clang 7.0 Bionic .deb Build + displayName: clang 8.0 Bionic .deb Build - job: SrcPrep displayName: Build Source Tar diff --git a/buildlib/cbuild b/buildlib/cbuild index 34051e55c24e81..0be5d498bc1ae8 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -432,7 +432,7 @@ class azure_pipelines(bionic): "abi-compliance-checker", "abi-dumper", "ca-certificates", - "clang-7", + "clang-8", "fakeroot", "gcc-9", "git", @@ -467,6 +467,9 @@ class azure_pipelines(bionic): self.add_ppa(tmpdir, "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu bionic main", "60C317803A41BA51845E371A1E9377A2BA9EF27F"); + self.add_ppa(tmpdir, + "deb [arch=amd64] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main", + "15CF4D18AF4F7421"); self.add_source_list(tmpdir,"arm64.list", """deb [arch=arm64] http://ports.ubuntu.com/ bionic main universe deb [arch=arm64] http://ports.ubuntu.com/ bionic-security main universe From patchwork Tue Jul 23 19:01:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055163 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 8545F1580 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 76D6628723 for ; Tue, 23 Jul 2019 19:01:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A52B28724; Tue, 23 Jul 2019 19:01:49 +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 EE9D528738 for ; Tue, 23 Jul 2019 19:01:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391651AbfGWTBs (ORCPT ); Tue, 23 Jul 2019 15:01:48 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:35325 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391637AbfGWTBs (ORCPT ); Tue, 23 Jul 2019 15:01:48 -0400 Received: by mail-qt1-f195.google.com with SMTP id d23so42974904qto.2 for ; Tue, 23 Jul 2019 12:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XRdZj1Zvb8MX9SSm2nB0KIj52rEnPTFvLcvMpWBeU2I=; b=pUzrn1OMw3yQlb0HMThEKw5aYK21dXyIWwB26ns4BrUNeEDnd5jX2/coFZ4jA4ZmG2 oTUU5E2F1EHx1/nxUjdoAS2D1coYmhjujgccyxQDlNCqkfaPCyf7iMvmduxAgJay3Sfm C338aKkdmGBxFRW3nOaDH4lN+xRNa2StLZffQDlpo/5vX8WiCl1Q0VOXsM+u1G8HIIQx wmNNsjHvrtPeB3fACELpJnv2HA1OBVDCBy1r2tXLVtTXo6mQEkiRj9KNcJmjXSFH5Dlc DeGlh39ni85d4ip8y8ar6fYtOWN2g/sGf51jsNJMypYiF9PX0yRBXquNv3o/9PKITT6M zQAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XRdZj1Zvb8MX9SSm2nB0KIj52rEnPTFvLcvMpWBeU2I=; b=bR1ivxEyfDANNqhR0jufYp56k9HSSizMwyoqoQ0g20S1aM+YRn5ykO9hlUA4N8BbCE 8Ff0e65BMusa3O7d5usqnX0aZh705dTa7gE06ffy66djuLrjHm87VY5q6/bIedFzKCM/ Zn+WHh2DGVFlhfKVqLRViGcT305pZ0oU35s3cBU6GFnVwTcsvs6rr7CLTOrVPBnDXBo+ /WR26IWU8Lmt1qnheIqPkG5lIMRJzpC0jacZEKyA7Wvjsdps/kUDq5pHWG3vU/RyD15S 3JB+5OyHVqURJeZMNax4xg6SGjETX8s1FBaccEAcEWb8XhhugQd4KsYv3kTbKhJ2dLIM k2AQ== X-Gm-Message-State: APjAAAVzihfcO4MIhsPHxm/G6LWuvIbBGMeH5mV09cbCT3LKtQQwhiOh mWR1sFWRxZ3drzkEBSF5mWaXfLaOjLZvfQ== X-Google-Smtp-Source: APXvYqwOc07k7WtyS1BkTmiypkjQTDtIyD9GPaLr3aQQrdE7eUVc0MEp+LHrUN7EF61nmpflOeJ19g== X-Received: by 2002:ac8:689a:: with SMTP id m26mr54220249qtq.192.1563908506875; Tue, 23 Jul 2019 12:01:46 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id 39sm24021537qts.41.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044p-NX; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 11/19] build/azp: Run a test compile on ppc64el as well Date: Tue, 23 Jul 2019 16:01:29 -0300 Message-Id: <20190723190137.15370-12-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Now that we have bionic this is fairly simple to get a cross compile environment, use the same approach as for ARM64. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 8 ++++++++ buildlib/cbuild | 16 +++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index f6f71ac0adfa42..1d4e1f317bbe0f 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -90,6 +90,14 @@ stages: ninja displayName: gcc 8.3 ARM64 Compile + - bash: | + set -e + mkdir build-ppc64el + cd build-ppc64el + CC=powerpc64le-linux-gnu-gcc-8 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + ninja + displayName: gcc 8.3 PPC64EL Compile + # When running cmake through debian/rules it is hard to set -Werror, # instead force it on by changing the CMakeLists.txt - bash: | diff --git a/buildlib/cbuild b/buildlib/cbuild index 0be5d498bc1ae8..6e9a9cec9cd6cd 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -457,6 +457,15 @@ class azure_pipelines(bionic): "libnl-route-3-dev:arm64", "libsystemd-dev:arm64", "libudev-dev:arm64", + } | { + # PPC 64 cross compiler + "gcc-8-powerpc64le-linux-gnu", + "libgcc-8-dev:ppc64el", + "libc6-dev:ppc64el", + "libnl-3-dev:ppc64el", + "libnl-route-3-dev:ppc64el", + "libsystemd-dev:ppc64el", + "libudev-dev:ppc64el", } to_azp = True; name = "azure_pipelines"; @@ -471,12 +480,13 @@ class azure_pipelines(bionic): "deb [arch=amd64] http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main", "15CF4D18AF4F7421"); self.add_source_list(tmpdir,"arm64.list", - """deb [arch=arm64] http://ports.ubuntu.com/ bionic main universe -deb [arch=arm64] http://ports.ubuntu.com/ bionic-security main universe -deb [arch=arm64] http://ports.ubuntu.com/ bionic-updates main universe"""); + """deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ bionic main universe +deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ bionic-security main universe +deb [arch=arm64,ppc64el] http://ports.ubuntu.com/ bionic-updates main universe"""); res.lines.insert(1,"ADD etc/ /etc/"); res.lines.insert(1,"RUN dpkg --add-architecture i386 &&" + "dpkg --add-architecture ppc64el &&" "dpkg --add-architecture arm64 &&" "sed -i -e 's/^deb /deb [arch=amd64,i386] /g' /etc/apt/sources.list"); return res; From patchwork Tue Jul 23 19:01:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055189 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 45A33746 for ; Tue, 23 Jul 2019 19:11:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3776728684 for ; Tue, 23 Jul 2019 19:11:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B5FD2872E; Tue, 23 Jul 2019 19:11:36 +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 C8D2128684 for ; Tue, 23 Jul 2019 19:11:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728981AbfGWTLf (ORCPT ); Tue, 23 Jul 2019 15:11:35 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:39216 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLe (ORCPT ); Tue, 23 Jul 2019 15:11:34 -0400 Received: by mail-qt1-f194.google.com with SMTP id l9so42951981qtu.6 for ; Tue, 23 Jul 2019 12:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d94miwNGPDvNb/uhiZs6CZ6LScEv7LiX+m1CyRfT1yM=; b=nT4cZL5qEB/ulY4OPm9/Vip2DUh2JsolZ4WTdwgT5L1+qiFMYRUys7gdYMN3Z9/D+F 8ES/naZfCkidbazC9yk6mylVX7AWvigXM6viyw8CpjmmSS2NpYvFKYJl7rcLMJLSxcjr S74XrD0znxHtGs7HG8iH1i+Kdpvd4HG0MDCFvqWWwwtAcBPqRFQEI2f79ZiNq/3WAvBl AQKUHzRGkq+kWgkbBKDJxJJq/fRmpC43zd1k5r6ZFrwnVQ+1ATikfhZisUV/NybtBSp3 sKrFgM8l40G7wdySwPW9gr69tgIUUbocRmnmZm92Oql8CUvDYfMeJA3tQ3yoeVWSgZ/k ijgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=d94miwNGPDvNb/uhiZs6CZ6LScEv7LiX+m1CyRfT1yM=; b=QdKH7aDxTn33a9+WOj/rSFtIjqyTGh+VK4CqSTu7wx8hvY3JOklEC4S7j7FEofS7H2 WVDBIfZZb3gxhO/d8v98/+APWqJgVXw83MiaXllYCVqfY6CwEqP6CxvIbVPpeq8tzWqV Lg1+jagdDZHJ/5tDNiX21iYC1PYMRo1VRUWjBNuYkAr4ixNF+V3xS/IDwAiobAZuMj+j 1pgLyPaTycgk8u0BdVxdDRZwCQcQKmCDW4bWKySm0tsYfovVg0WG72BWaQbbLwgHY+El oRgPx+1ntSCO9CK+/UFrRMFY7Abn1Y4xk3YHnFB6iNE59bHwacLgfaWO8ye8OPf/pq84 BvHQ== X-Gm-Message-State: APjAAAWHlEu8LYL9ar0PQZXw9VTuTI1aME1SQ5DwgXojQHhSY21NGXGU UsFEtZSEonhLmJM9JZPcHAgo9jP4UA5gbQ== X-Google-Smtp-Source: APXvYqyru5U+Y6vnOeB90Pd7QNxecBHtwutaYfyBNNJ0clI+/58qzgiXP4LGSpZRQzg1tX/iUACimA== X-Received: by 2002:a0c:afeb:: with SMTP id t40mr54737815qvc.28.1563909093527; Tue, 23 Jul 2019 12:11:33 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id f20sm17352184qkh.15.2019.07.23.12.11.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:33 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00044v-Oq; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 12/19] build/azp: Add Fedora 30 to the distro testing Date: Tue, 23 Jul 2019 16:01:30 -0300 Message-Id: <20190723190137.15370-13-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Fedora represents the latest cutting edge upstream. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 7 +++++++ buildlib/cbuild | 1 + 2 files changed, 8 insertions(+) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 1d4e1f317bbe0f..7df483e3329534 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -13,6 +13,9 @@ resources: - container: centos7 image: ucfconsort.azurecr.io/rdma-core/centos7:25.0 endpoint: ucfconsort_registry + - container: fedora + image: ucfconsort.azurecr.io/rdma-core/fc30:25.0 + endpoint: ucfconsort_registry - container: leap image: ucfconsort.azurecr.io/rdma-core/opensuse-15.0:25.0 endpoint: ucfconsort_registry @@ -149,6 +152,10 @@ stages: CONTAINER: centos7 SPEC: redhat/rdma-core.spec RPMBUILD_OPTS: + fedora30: + CONTAINER: fedora + SPEC: redhat/rdma-core.spec + RPMBUILD_OPTS: leap: CONTAINER: leap SPEC: suse/rdma-core.spec diff --git a/buildlib/cbuild b/buildlib/cbuild index 6e9a9cec9cd6cd..1441a91a8427fd 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -184,6 +184,7 @@ class fc30(Environment): ninja_cmd = "ninja-build"; is_rpm = True; aliases = {"fedora"}; + to_azp = True; def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); From patchwork Tue Jul 23 19:01:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055199 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 F147B6C5 for ; Tue, 23 Jul 2019 19:11:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E11F928684 for ; Tue, 23 Jul 2019 19:11:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D56322872E; Tue, 23 Jul 2019 19:11:41 +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 26DBD28684 for ; Tue, 23 Jul 2019 19:11:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729571AbfGWTLk (ORCPT ); Tue, 23 Jul 2019 15:11:40 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:39388 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLk (ORCPT ); Tue, 23 Jul 2019 15:11:40 -0400 Received: by mail-qk1-f194.google.com with SMTP id w190so31920319qkc.6 for ; Tue, 23 Jul 2019 12:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Lz5MTuqfXxvjBuzR2PQib/9Vw5DvcY8g/qxbQf+4H0w=; b=ix3BFGlI2C69ooNZ/av43hDls0gSGoiqHEykLzmHkAVl2fZj4TBDd/hekwoExc99tI sTuK8oqKoa6F+3aprpImFSxruHonDHCM05yow1wnRyBJon2nHJN+osTNm1luagjcvGy1 hv7NahnJW9D8eCEhqIV9P7SJsleWP42ZbgYaDJ+j3/s0kfw04vUDwlg9WHvPTQzZz08Q obIxEUTQgPZMRdn8cqpw6X1I+E/+1ANnvtT56q0kMJEy9fPC8jrNjjqRHeYPB809U2tc LWpbG9K/fCRNyj474hsYdGgiZRSNkn/YTON6oQioiOpEMUdMPcPEVtKG/aC4zo3L6uWx qqpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Lz5MTuqfXxvjBuzR2PQib/9Vw5DvcY8g/qxbQf+4H0w=; b=ND0+NxdRlLHskurgEGzgx3VRLLM8+1+SvVd8J3g5LY6xawmwGyiXka5vq+0ransTlR uGn5vJnGOwCqF5wyf5HxE4Urn5poQ4bAsggqN5g52wGBgDM4TWJuCab2rBqBZEEKKEUu ee0yhFSSl6LGI4nHq0v5SWMThcl5/22drr/iS2qt1ULPRSFh9Y/vdDx6YWfN5E8ivf0K sBlcEHpgseCl4hEWRIg1MxrjnQj00JnPuIPE8ohUXwc7KhbnyR01/8wOuq/Z1RaIYCnr 5jiV9PlcEuS8QnW9WEEbK7PDiG+areijgacpsjJF6jqSWApkSsG0GBih47aeE6ieW1w8 Xoiw== X-Gm-Message-State: APjAAAUeHfbdktTjbCE7AQGLZQltd/2MKkhHIphysGAQWGYJX1ATZzQS IkHf/yepz0aUL/5OaoivJAMdRW/Vr+jx8w== X-Google-Smtp-Source: APXvYqxmkTKGUrnclMbj2q2i+tZZvdlVQox0lDw1CNIjmmoJpa01MXlCVgxW6mO3c8p8CLZ/esCZRg== X-Received: by 2002:a05:620a:12f8:: with SMTP id f24mr54193322qkl.202.1563909098849; Tue, 23 Jul 2019 12:11:38 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id z1sm20214939qke.122.2019.07.23.12.11.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:38 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-000451-Py; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 13/19] build/azp: Update check-build to work with python3 Date: Tue, 23 Jul 2019 16:01:31 -0300 Message-Id: <20190723190137.15370-14-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Remove dependencies on python2.7 so it can be removed from the container. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 10 +++++--- buildlib/cbuild | 7 +++-- buildlib/check-build | 50 +++++++++++++++++++----------------- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 7df483e3329534..39188a4c0b727b 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -44,11 +44,13 @@ stages: ninja displayName: gcc 9.1 Compile - - bash: | - set -e - cd build-gcc9 - python2.7 ../buildlib/check-build --src .. --cc gcc-9 + - task: PythonScript@0 displayName: Check Build Script + inputs: + scriptPath: buildlib/check-build + arguments: --src .. --cc gcc-9 + workingDirectory: build-gcc9 + pythonInterpreter: /usr/bin/python3 # Run sparse on the subdirectories which are sparse clean - bash: | diff --git a/buildlib/cbuild b/buildlib/cbuild index 1441a91a8427fd..1de550e7bf8934 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -903,8 +903,11 @@ def run_azp_build(args,env): script.append(I["bash"]); elif I.get("task") == "PythonScript@0": script.append("set -e"); - script.append("%s %s"%(I["inputs"]["pythonInterpreter"], - I["inputs"]["scriptPath"])); + if "workingDirectory" in I["inputs"]: + script.append("cd %s"%(os.path.join(srcdir,I["inputs"]["workingDirectory"]))); + script.append("%s %s %s"%(I["inputs"]["pythonInterpreter"], + os.path.join(srcdir,I["inputs"]["scriptPath"]), + I["inputs"].get("arguments",""))); else: raise ValueError("Unknown stanza %r"%(I)); diff --git a/buildlib/check-build b/buildlib/check-build index 82812272b40b1d..acb72f0e1f2588 100755 --- a/buildlib/check-build +++ b/buildlib/check-build @@ -1,7 +1,8 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2017 Obsidian Research Corp. # Licensed under BSD (MIT variant) or GPLv2. See COPYING. """check-build - Run static checks on a build""" +from __future__ import print_function import argparse import inspect import os @@ -18,7 +19,7 @@ from distutils.version import LooseVersion; def get_src_dir(): """Get the source directory using git""" - git_top = subprocess.check_output(["git","rev-parse","--git-dir"]).strip(); + git_top = subprocess.check_output(["git","rev-parse","--git-dir"]).decode().strip(); if git_top == ".git": return "."; return os.path.dirname(git_top); @@ -55,7 +56,8 @@ def private_tmp(): def get_symbol_vers(fn,exported=True): """Return the symbol version suffixes from the ELF file, eg IB_VERBS_1.0, etc""" - syms = subprocess.check_output(["readelf","--wide","-s",fn]); + syms = subprocess.check_output(["readelf","--wide","-s",fn]).decode(); + go = False; res = set(); for I in syms.splitlines(): @@ -166,7 +168,7 @@ def check_abi(args,fn): "-o",cur_fn]); if not os.path.exists(ref_fn): - print >> sys.stderr, "ABI file does not exist for %r"%(ref_fn); + print("ABI file does not exist for %r"%(ref_fn), file=sys.stderr); return False; subprocess.check_call(["abi-compliance-checker", @@ -183,7 +185,7 @@ def test_verbs_uapi(args): # User must provide the ABI dir in the source tree if not os.path.isdir(os.path.join(args.SRC,"ABI")): - print "ABI check skipped, no ABI/ directory."; + print("ABI check skipped, no ABI/ directory."); return; libd = os.path.join(args.BUILD,"lib"); @@ -221,24 +223,24 @@ def get_headers(incdir): return includes; def compile_test_headers(tmpd,incdir,includes,with_cxx=False): - cppflags = subprocess.check_output(["pkg-config","libnl-3.0","--cflags-only-I"]).strip(); + cppflags = subprocess.check_output(["pkg-config","libnl-3.0","--cflags-only-I"]).decode().strip(); cppflags = "-I %s %s"%(incdir,cppflags) with open(os.path.join(tmpd,"build.ninja"),"wt") as F: - print >> F,"rule comp"; - print >> F," command = %s -Werror -c %s $in -o $out"%(args.CC,cppflags); - print >> F," description=Header check for $in"; - print >> F,"rule comp_cxx"; - print >> F," command = %s -Werror -c %s $in -o $out"%(args.CXX,cppflags); - print >> F," description=Header C++ check for $in"; + print("rule comp", file=F); + print(" command = %s -Werror -c %s $in -o $out"%(args.CC,cppflags), file=F); + print(" description=Header check for $in", file=F); + print("rule comp_cxx", file=F); + print(" command = %s -Werror -c %s $in -o $out"%(args.CXX,cppflags), file=F); + print(" description=Header C++ check for $in", file=F); count = 0; for I in sorted(includes): if is_obsolete(I) or is_fixup(I): continue; - print >> F,"build %s : comp %s"%("out%d.o"%(count),I); - print >> F,"default %s"%("out%d.o"%(count)); - print >> F,"build %s : comp_cxx %s"%("outxx%d.o"%(count),I); + print("build %s : comp %s"%("out%d.o"%(count),I), file=F); + print("default %s"%("out%d.o"%(count)), file=F); + print("build %s : comp_cxx %s"%("outxx%d.o"%(count),I), file=F); if with_cxx: - print >> F,"default %s"%("outxx%d.o"%(count)); + print("default %s"%("outxx%d.o"%(count)), file=F); count = count + 1; subprocess.check_call(["ninja"],cwd=tmpd); @@ -286,7 +288,7 @@ def test_installed_headers(args): subprocess.check_output(["ninja","install"],env=env,cwd=args.BUILD); includes = get_headers(tmpd); - incdir = os.path.commonprefix(includes); + incdir = os.path.commonprefix(list(includes)); rincludes = {I[len(incdir):] for I in includes}; bincdir = os.path.abspath(os.path.join(args.BUILD,"include")); @@ -308,7 +310,7 @@ def test_installed_headers(args): os.makedirs(dfn); assert not os.path.exists(I); with open(I,"w") as F: - print >> F,'#error "Private internal header"'; + print('#error "Private internal header"', file=F); # Roughly check that the headers have the extern "C" for C++ # compilation. @@ -324,7 +326,7 @@ def test_installed_headers(args): def get_symbol_names(fn): """Return the defined, public, symbols from a ELF shlib""" - syms = subprocess.check_output(["readelf", "--wide", "-s", fn]) + syms = subprocess.check_output(["readelf", "--wide", "-s", fn]).decode() go = False res = set() for I in syms.splitlines(): @@ -352,7 +354,7 @@ def get_cc_args_from_pkgconfig(args, name, static): flags = ["pkg-config", "--errors-to-stdout", "--cflags", "--libs"] if static: flags.append("--static") - opts = subprocess.check_output(flags + ["lib" + name]) + opts = subprocess.check_output(flags + ["lib" + name]).decode() opts = shlex.split(opts) opts.insert(0, "-Wall") @@ -365,7 +367,7 @@ def get_cc_args_from_pkgconfig(args, name, static): # The old pkg-config that travis uses incorrectly removes duplicated # flags, which breaks linking. if (name == "ibverbs" and - subprocess.check_output(["pkg-config", "--version"]).strip() == "0.26"): + subprocess.check_output(["pkg-config", "--version"]).decode().strip() == "0.26"): opts.insert(0, "-libverbs") # Only static link the pkg-config stuff, otherwise we get warnings about @@ -392,7 +394,7 @@ def get_cc_args_from_pkgconfig(args, name, static): def compile_ninja(args, Fninja, name, cfn, opts): - print >> Fninja, """ + print(""" rule comp_{name} command = {CC} -Wall -o $out $in {opts} description = Compile and link $out @@ -401,7 +403,7 @@ default {name}""".format( name=name, CC=args.CC, cfn=cfn, - opts=" ".join(pipes.quote(I) for I in opts)) + opts=" ".join(pipes.quote(I) for I in opts)), file=Fninja) def get_providers(args): @@ -510,6 +512,6 @@ args.SRC = os.path.abspath(args.SRC); args.PACKAGE_VERSION = get_package_version(args); funcs = globals(); -for k,v in funcs.items(): +for k,v in list(funcs.items()): if k.startswith("test_") and inspect.isfunction(v): v(args); From patchwork Tue Jul 23 19:01:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055197 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 CBE8414F6 for ; Tue, 23 Jul 2019 19:11:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BA71D28684 for ; Tue, 23 Jul 2019 19:11:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE7922872E; Tue, 23 Jul 2019 19:11:40 +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 0275C28725 for ; Tue, 23 Jul 2019 19:11:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729398AbfGWTLj (ORCPT ); Tue, 23 Jul 2019 15:11:39 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:45849 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLj (ORCPT ); Tue, 23 Jul 2019 15:11:39 -0400 Received: by mail-qt1-f195.google.com with SMTP id x22so38053731qtp.12 for ; Tue, 23 Jul 2019 12:11:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7z7AyjDUrHUPyguGqWPdnXY6cT/lWyMNV1dB37o5Ea8=; b=lSAbCI6gV8OJNe4zojBPVvl3+qNZv+sQg19zGPkbeYp26M1ARSyuCMrbgCUZ61c2ck RyUZ3RNI7+kWm6mpXumFIrQkzpikeZnGrTTytkGoO33lOsSN1C/Zkk866Oap/q14k7+n y9o4nksH8zo2HQy/afvoIoYhoXL1dVR71E5y90eZ+pI7MvTkiBHYQcNzAn66Nn6mWw1N RdLMKe4AX/jSHObbOzVcY+/Sn7+mL4xnsztBa8ZpIeJoU5JpUGFELSK/qZlKWHsXUA9b DktNdyh/lm1U2pVDuyRDsDc+yFt58t6COpYb2gkinLgg8zEzrGpIG+0WwvitCfF9J2W9 1rsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7z7AyjDUrHUPyguGqWPdnXY6cT/lWyMNV1dB37o5Ea8=; b=VbtrFROM6NxoB/QT10Q/MyjBtEiqM6jVU1KVk+AGNK/+yCuP8bmL8cjRA0WsqDq+9I Z/8xjfgvf4IMtFugU83RVbM2W6mPdq/vGBA5WkawAsq/axNQjDbUz201uP5oG49RKwit o2W+PPo+A6FevAktYJoUS1Ow6zyRNrEfVq5Vbo9JM4MkcdT49OuC2AbZ6DCphcHWEIvu BY6Yg02WXcBWZMj+vrzKmJSG9wcjpxUcLH5IINnb867k5cwsup8D1TvXdWomg150pNzp i0+3tGbbErovbp4Xs5Ui4XCQhWPz5Ynl/hEOLM+IVLaMVSpgMVfDoZRTGjs/N6EmCASX cVfw== X-Gm-Message-State: APjAAAVrjNTU3UZyb3yQgPPrizDo8zi2GPZrOjMCdZksKezG8w8imarv zQvg7PDeHns3gWQycMhTTjP50U3VAA9qeg== X-Google-Smtp-Source: APXvYqzoI9ragMjdViMfW4R93TiFofAVawSHIfT7cbMiWVdCouJlwrIVAePKTg0DdvYyWcZlka4x0g== X-Received: by 2002:ac8:c0e:: with SMTP id k14mr54165396qti.72.1563909096835; Tue, 23 Jul 2019 12:11:36 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id 131sm20115725qkn.7.2019.07.23.12.11.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:36 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-000457-R7; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 14/19] build/cbuild: Update cbuild to work with python3 Date: Tue, 23 Jul 2019 16:01:32 -0300 Message-Id: <20190723190137.15370-15-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe This is the last script run from azp that was using python2. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 2 +- buildlib/cbuild | 53 +++++++++++++++++++----------------- 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 39188a4c0b727b..e062908e23756b 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -134,7 +134,7 @@ stages: ninja docs cd ../artifacts # FIXME: Check Build.SourceBranch for tag consistency - python2.7 ../buildlib/cbuild make-dist-tar ../build-pandoc + python3 ../buildlib/cbuild make-dist-tar ../build-pandoc displayName: Prebuild Documentation - task: PublishPipelineArtifact@0 diff --git a/buildlib/cbuild b/buildlib/cbuild index 1de550e7bf8934..d6727f46669197 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015-2016 Obsidian Research Corp. # Licensed under BSD (MIT variant) or GPLv2. See COPYING. # PYTHON_ARGCOMPLETE_OK @@ -36,6 +36,7 @@ finished, only the base container created during 'build-images' is kept. The running the build command and instead run an interactive bash shell. This is useful for debugging certain kinds of build problems.""" +from __future__ import print_function import argparse import collections import filecmp @@ -572,8 +573,8 @@ def docker_cmd_str(env,*cmd): """Invoke docker""" cmd = list(cmd); if env.sudo: - return subprocess.check_output(["sudo","docker"] + cmd); - return subprocess.check_output(["docker"] + cmd); + return subprocess.check_output(["sudo","docker"] + cmd).decode(); + return subprocess.check_output(["docker"] + cmd).decode(); @contextmanager def private_tmp(args): @@ -684,7 +685,7 @@ def run_rpm_build(args,spec_file,env): # rpmbuild complains if we do not have an entry in passwd and group # for the user we are going to use to do the build. with open(os.path.join(tmpdir,"go.py"),"w") as F: - print >> F,""" + print(""" import os,subprocess; with open("/etc/passwd","a") as F: F.write({passwd!r} + "\\n"); @@ -703,7 +704,7 @@ os.symlink({tarfn!r},os.path.join(b"SOURCES",tarfn)); uid=os.getuid(), gid=os.getgid(), tarfn=tarfn, - tspec_file=tspec_file); + tspec_file=tspec_file), file=F); extra_opts = getattr(env,"rpmbuild_options", []) bopts = ["-bb",tspec_file] + extra_opts; @@ -715,8 +716,8 @@ os.symlink({tarfn!r},os.path.join(b"SOURCES",tarfn)); if env.build_pyverbs: bopts.extend(["--with", "pyverbs"]); - print >> F,'os.execlp("rpmbuild","rpmbuild",%s)'%( - ",".join(repr(I) for I in bopts)); + print('os.execlp("rpmbuild","rpmbuild",%s)'%( + ",".join(repr(I) for I in bopts)), file=F); if args.run_shell: opts.append("-ti"); @@ -729,10 +730,10 @@ os.symlink({tarfn!r},os.path.join(b"SOURCES",tarfn)); docker_cmd(args,*opts) - print + print() for path,jnk,files in os.walk(os.path.join(tmpdir,"RPMS")): for I in files: - print "Final RPM: ",os.path.join("..",I); + print("Final RPM: ",os.path.join("..",I)); shutil.move(os.path.join(path,I), os.path.join("..",I)); @@ -765,7 +766,7 @@ def run_deb_build(args,env): # Create a go.py that will let us run the compilation as the user and # then switch to root only for the packaging step. with open(os.path.join(tmpdir,"go.py"),"w") as F: - print >> F,""" + print(""" import subprocess,os; def to_user(): os.setgid({gid:d}); @@ -774,7 +775,7 @@ subprocess.check_call(["debian/rules","debian/rules","build"], preexec_fn=to_user); subprocess.check_call(["debian/rules","debian/rules","binary"]); """.format(uid=os.getuid(), - gid=os.getgid()); + gid=os.getgid()), file=F); if args.run_shell: opts.append("-ti"); @@ -787,10 +788,10 @@ subprocess.check_call(["debian/rules","debian/rules","binary"]); docker_cmd(args,*opts); - print + print() for I in os.listdir(tmpdir): if I.endswith(".deb"): - print "Final DEB: ",os.path.join("..",I); + print("Final DEB: ",os.path.join("..",I)); shutil.move(os.path.join(tmpdir,I), os.path.join("..",I)); @@ -810,7 +811,7 @@ def copy_abi_files(src): if os.path.isfile(ref_fn) and filecmp.cmp(ref_fn,cur_fn,False): continue; - print "Changed ABI File: ", ref_fn; + print("Changed ABI File: ", ref_fn); shutil.copy(cur_fn, ref_fn); def run_travis_build(args,env): @@ -832,7 +833,7 @@ def run_travis_build(args,env): base = subprocess.check_output(["git", "--git-dir",os.path.join(opwd,".git"), "merge-base", - "HEAD","FETCH_HEAD"]).strip(); + "HEAD","FETCH_HEAD"]).decode().strip(); home = os.path.join(os.path.sep,"home","travis"); home_build = os.path.join(os.path.sep,home,"build"); @@ -856,10 +857,10 @@ def run_travis_build(args,env): cmds = yaml.safe_load(F)["script"]; with open(os.path.join(tmpdir,"go.sh"),"w") as F: - print >> F,"#!/bin/bash"; - print >> F,"set -e"; + print("#!/bin/bash", file=F); + print("set -e", file=F); for I in cmds: - print >> F,I; + print(I, file=F); if args.run_shell: opts.append("-ti"); @@ -872,7 +873,7 @@ def run_travis_build(args,env): try: docker_cmd(args,*opts); - except subprocess.CalledProcessError, e: + except subprocess.CalledProcessError as e: copy_abi_files(os.path.join(tmpdir, "src/ABI")); raise; copy_abi_files(os.path.join(tmpdir, "src/ABI")); @@ -929,7 +930,7 @@ def run_azp_build(args,env): base = subprocess.check_output(["git", "--git-dir",os.path.join(opwd,".git"), "merge-base", - "HEAD","FETCH_HEAD"]).strip(); + "HEAD","FETCH_HEAD"]).decode().strip(); opts = [ "run", @@ -959,7 +960,7 @@ def run_azp_build(args,env): try: docker_cmd(args,*opts); - except subprocess.CalledProcessError, e: + except subprocess.CalledProcessError as e: copy_abi_files(os.path.join(tmpdir, "s/ABI")); raise; copy_abi_files(os.path.join(tmpdir, "s/ABI")); @@ -988,7 +989,7 @@ def cmd_pkg(args): getattr(env,"specfile","%s.spec"%(project)), env); else: - print "%s does not support packaging"%(env.name); + print("%s does not support packaging"%(env.name)); # ------------------------------------------------------------------------- @@ -1102,7 +1103,7 @@ def cmd_build_images(args): fn = os.path.join(tmpdir,"Dockerfile"); with open(fn,"wt") as F: for ln in df.lines: - print >> F,ln; + print(ln, file=F); opts = (["build"] + get_build_args(args,env) + ["-f",fn, @@ -1176,13 +1177,15 @@ def cmd_make_dist_tar(args): if __name__ == '__main__': parser = argparse.ArgumentParser(description='Operate docker for building this package') - subparsers = parser.add_subparsers(title="Sub Commands"); + subparsers = parser.add_subparsers(title="Sub Commands",dest="command"); + subparsers.required = True; funcs = globals(); - for k,v in funcs.items(): + for k,v in list(funcs.items()): if k.startswith("cmd_") and inspect.isfunction(v): sparser = subparsers.add_parser(k[4:].replace('_','-'), help=v.__doc__); + sparser.required = True; funcs["args_" + k[4:]](sparser); sparser.set_defaults(func=v); From patchwork Tue Jul 23 19:01:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055157 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 505D16C5 for ; Tue, 23 Jul 2019 19:01:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 403FA2873B for ; Tue, 23 Jul 2019 19:01:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33DED2873E; Tue, 23 Jul 2019 19:01:48 +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 50D1028724 for ; Tue, 23 Jul 2019 19:01:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391639AbfGWTBp (ORCPT ); Tue, 23 Jul 2019 15:01:45 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:46452 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391637AbfGWTBp (ORCPT ); Tue, 23 Jul 2019 15:01:45 -0400 Received: by mail-qk1-f196.google.com with SMTP id r4so31840460qkm.13 for ; Tue, 23 Jul 2019 12:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3xizULMY+3etu/2FnZTSV4yQ4WFrL4KEPZtIVZVyx4k=; b=Q6Tx1JrfcxSmfqEo6OVJAE+cEql7sG7s8J1caVCvSpyArRgPmKPys1WoXLI7vjsANX WxX/XndIN7jQ8Ql9DoDuSXY9wDymmi7JituT/4lKxA5D1EsMCtaqIgmQmzWUhlqFXu71 EXgcWXPkeKT24ukwMM8BXlQw3hoxgQXrPoisV6MIB4SQJHCnKvFSP4eaGvjFNMb4KIrF qNN4O8bgCFmF+gruZPCBAtG6pswir0SBL2xnmPDVlsK0RMXN9Ooyf3Iyi+Pp+RxIqE1Z dtNELqcTRPW4fJoN2c/PKGJz40zqUYqn9zx55uJfZaZcXxNFRQVbO3MIP1PlhyXDWP74 ycMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3xizULMY+3etu/2FnZTSV4yQ4WFrL4KEPZtIVZVyx4k=; b=gKZ9vUjfip0JOxEwyQxtMVRhsbhUwTZ9GIoRZ125E20b2KZxMRIAsnoOQWwXBH0QHv +0o9coWDnhBLoPMI3fXv2R9gDFrdzXciPmBHc3UixhJA4pKRLpiHxU9bVzMSsL+mMwBa 34yGsLSgFK01w8KqCdggt7PBhpnjkxioJtr2o8Zq9q0KsuicGtRUuTptTCqyW3QgiXjP 9ZlS6UegvI7QCE/faE6T5lKmJmgR9/DNg4xxT0mP8OeFXllWMq9Xe689NpazqW3yBAws hgJ1trSyxvZ/9QmXVly1Y2rdKHX/lqNtixOghz3xLIKkPyzv9dLjNVNVhvmPvQkbhbO/ 1pIw== X-Gm-Message-State: APjAAAWr5oeeIEn2xaP+5MZxwYvyETuHseBZDtNa5d2ZIzLHu5BVe5bV RVuEgHLNsAqJ0uIHUnGMazlDT947H995ww== X-Google-Smtp-Source: APXvYqxXPJr7RtjAifUTNTCqGC2PmiCBk3vb2mOANh3infYXJtM63Ma9Tqckxz6+F/q9wkIwatGZWw== X-Received: by 2002:a37:6146:: with SMTP id v67mr35456091qkb.493.1563908504351; Tue, 23 Jul 2019 12:01:44 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id h40sm25618528qth.4.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00045D-SF; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 15/19] build/azp: Reduce the package list Date: Tue, 23 Jul 2019 16:01:33 -0300 Message-Id: <20190723190137.15370-16-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Remove some unneeded packages and files from the container. The unpacked image size is reduced by about 120MB. Signed-off-by: Jason Gunthorpe --- buildlib/cbuild | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/buildlib/cbuild b/buildlib/cbuild index d6727f46669197..cc9c7e2999a9d2 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -200,7 +200,7 @@ class APTEnvironment(Environment): build_python = True; def get_docker_file(self,tmpdir): res = DockerFile(self.docker_parent); - res.lines.append("RUN apt-get update && apt-get install -y --no-install-recommends %s && apt-get clean && rm -rf /usr/share/doc/ /usr/lib/debug"%( + res.lines.append("RUN apt-get update && apt-get install -y --no-install-recommends %s && apt-get clean && rm -rf /usr/share/doc/ /usr/lib/debug /var/lib/apt/lists/"%( " ".join(sorted(self.pkgs)))); return res; @@ -429,19 +429,38 @@ class tumbleweed(ZypperEnvironment): # ------------------------------------------------------------------------- -class azure_pipelines(bionic): - pkgs = bionic.pkgs | { +class azure_pipelines(APTEnvironment): + docker_parent = "ubuntu:18.04" + pkgs = { "abi-compliance-checker", "abi-dumper", "ca-certificates", "clang-8", + "cmake", + "cython3", + "debhelper", + "dh-systemd", + "dpkg-dev", "fakeroot", "gcc-9", "git", "python2.7", + "libc6-dev", + "libnl-3-dev", + "libnl-route-3-dev", + "libsystemd-dev", + "libudev-dev", + "make", + "ninja-build", + "pandoc", + "pkg-config", + "python3-docutils", + "python3", + "python3-dev", + "python3-docutils", "python3-yaml", "sparse", - 'python-docutils', + "valgrind", } | { # 32 bit build support "libgcc-9-dev:i386", From patchwork Tue Jul 23 19:01:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055153 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 4DFEB14DB for ; Tue, 23 Jul 2019 19:01:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F06B28723 for ; Tue, 23 Jul 2019 19:01:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32F1928725; Tue, 23 Jul 2019 19:01:46 +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 847F628724 for ; Tue, 23 Jul 2019 19:01:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391638AbfGWTBp (ORCPT ); Tue, 23 Jul 2019 15:01:45 -0400 Received: from mail-qk1-f195.google.com ([209.85.222.195]:33115 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbfGWTBo (ORCPT ); Tue, 23 Jul 2019 15:01:44 -0400 Received: by mail-qk1-f195.google.com with SMTP id r6so31948284qkc.0 for ; Tue, 23 Jul 2019 12:01:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kwBVlFVHmUAlk0RjbeDedOf4oiOvdg+h11F4wryhtzQ=; b=Hz3zJjpw5A8MWnCQqxzJrHCQt7ezRIIVtx+J6mVnB4BN6WH42EZOf+P3QsO2Nzp+Fo 0lA2shCxlEsE3CqCed2XVXh+4idA3G0o0Rit2fW2Ta39qVPXYvWH13cNgzCtfRXazW9f 30AepX/HuIxnIGqCThZ2tw6+dxtio3Y+sfPLSBygEH2EbkR9b6hK54E0kGzMyCkuXL+K R4RaxBPz+sv0+dv7l7AiNFj9K2nRciTh9/wKiRZVTeAOn1/wslfqtEJnyrjkXRITlBPR KwA6W9sLCecXFIy1lUidK6hzFzPgq0GaZt/x6sE3WFi//5OlAJXc6PC2Y8zs1jQrpVMP 6YAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kwBVlFVHmUAlk0RjbeDedOf4oiOvdg+h11F4wryhtzQ=; b=b5tygkxNDv3eHpoS1wsJ5kYa+B2W1Pqr/7qEksr4Pe9T4Fj17YiuZuSsJfUjrrrmUJ 3bIXNgEadQugqHqxdPhS/ASk468ckUALGUasdywVTo46/0XEFLaPiUmeQYM/SYAkBGAX 9rJOLhp2i1sbLtqlpILL/tVvry24qxvPnpSEeLJ0MT+nwYTVQVOVKmeGvHm1U0ZzdDJN Y5rXKthMlexhnPaz1pH2de+dQCwwWJVPg2nobyuvrWHdLy+NsNfo9AVEWg8zce/GCZBV kwaxH09HcIx0r+xx+IGLbx/glwcnHA2baoZvufUskhtlk+zouK09mFqUyKHTb+NDHgrm 4vGQ== X-Gm-Message-State: APjAAAU+WVWqb0o1TXQN0jOwJvkZAyeneaA+k9ZnusTLQvwINGVGnYyY bAfgZKCi8vGpF844lQF36+04fOwe4D+TLg== X-Google-Smtp-Source: APXvYqyQUGQI6+/VcXFsZTy9X4Fpp28dA3PqSpDSuPxiitS43dto656hlDBron1vVTVLW+NzCgExRg== X-Received: by 2002:ae9:eb87:: with SMTP id b129mr49031437qkg.453.1563908503207; Tue, 23 Jul 2019 12:01:43 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id f14sm17998384qto.11.2019.07.23.12.01.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:01:41 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00045J-TO; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 16/19] build/azp: Add centos6 to the test distributions Date: Tue, 23 Jul 2019 16:01:34 -0300 Message-Id: <20190723190137.15370-17-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe We keep having small defects related to these old glibc's, run a build here too. The spec file is based on the old pre-packaging rdma-core spec file. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 11 +++- buildlib/cbuild | 15 +++-- buildlib/centos6.spec | 109 +++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 buildlib/centos6.spec diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index e062908e23756b..6a69e940a5b19e 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -10,6 +10,9 @@ resources: - container: azp image: ucfconsort.azurecr.io/rdma-core/azure_pipelines:25.0 endpoint: ucfconsort_registry + - container: centos6 + image: ucfconsort.azurecr.io/rdma-core/centos6:25.0 + endpoint: ucfconsort_registry - container: centos7 image: ucfconsort.azurecr.io/rdma-core/centos7:25.0 endpoint: ucfconsort_registry @@ -150,6 +153,10 @@ stages: vmImage: 'Ubuntu-16.04' strategy: matrix: + centos6: + CONTAINER: centos6 + SPEC: buildlib/centos6.spec + RPMBUILD_OPTS: centos7: CONTAINER: centos7 SPEC: redhat/rdma-core.spec @@ -175,7 +182,7 @@ stages: set -e mkdir SOURCES tmp tar --wildcards -xzf rdma-core*.tar.gz */$(SPEC) --strip-components=2 - RPM_SRC=$(rpmspec -P rdma-core.spec | awk '/^Source:/{split($0,a,"[ \t]+");print(a[2])}') + RPM_SRC=$((rpmspec -P *.spec || grep ^Source: *.spec) | awk '/^Source:/{split($0,a,"[ \t]+");print(a[2])}') (cd SOURCES && ln -sf ../rdma-core*.tar.gz "$RPM_SRC") - rpmbuild --define '_tmppath '$(pwd)'/tmp' --define '_topdir '$(pwd) -bb rdma-core.spec $(RPMBUILD_OPTS) + rpmbuild --define '_tmppath '$(pwd)'/tmp' --define '_topdir '$(pwd) -bb *.spec $(RPMBUILD_OPTS) displayName: Perform Package Build diff --git a/buildlib/cbuild b/buildlib/cbuild index cc9c7e2999a9d2..e7065e3e7d8d2d 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -131,9 +131,10 @@ class centos6(YumEnvironment): name = "centos6"; use_make = True; pandoc = False; - is_rpm = False; build_pyverbs = False; + specfile = "buildlib/centos6.spec"; python_cmd = "python"; + to_azp = True; class centos7(YumEnvironment): docker_parent = "centos:7"; @@ -713,11 +714,13 @@ with open("/etc/group","a") as F: os.setgid({gid:d}); os.setuid({uid:d}); -# Get RPM to tell us the expected tar filename. -for ln in subprocess.check_output(["rpmspec","-P",{tspec_file!r}]).splitlines(): - if ln.startswith(b"Source:"): - tarfn = ln.strip().partition(b' ')[2].strip(); -os.symlink({tarfn!r},os.path.join(b"SOURCES",tarfn)); +# For Centos6 +if "check_output" in dir(subprocess): + # Get RPM to tell us the expected tar filename. + for ln in subprocess.check_output(["rpmspec","-P",{tspec_file!r}]).splitlines(): + if ln.startswith(b"Source:"): + tarfn = ln.strip().partition(b' ')[2].strip(); + os.symlink({tarfn!r},os.path.join(b"SOURCES",tarfn)); """.format(passwd=":".join(str(I) for I in pwd.getpwuid(os.getuid())), group=":".join(str(I) for I in grp.getgrgid(os.getgid())), uid=os.getuid(), diff --git a/buildlib/centos6.spec b/buildlib/centos6.spec new file mode 100644 index 00000000000000..943b5e65c7e1e5 --- /dev/null +++ b/buildlib/centos6.spec @@ -0,0 +1,109 @@ +Name: rdma-core +Version: 25.0 +Release: 1%{?dist} +Summary: RDMA core userspace libraries and daemons + +# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license +# providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause +# providers/rxe/ Incorporates code from ipathverbs and contains the patent clause +# providers/hfi1verbs Uses the 3 Clause BSD license +License: (GPLv2 or BSD) and (GPLv2 or PathScale-BSD) +Url: https://github.com/linux-rdma/rdma-core +Source: rdma-core.tgz + +BuildRequires: binutils +BuildRequires: cmake >= 2.8.11 +BuildRequires: gcc +BuildRequires: libudev-devel +BuildRequires: pkgconfig +BuildRequires: pkgconfig(libnl-3.0) +BuildRequires: pkgconfig(libnl-route-3.0) +BuildRequires: valgrind-devel +BuildRequires: python + +%define CMAKE_FLAGS %{nil} +BuildRequires: make + +%description +Temporary packaging + +This is a simple example without the split sub packages to get things started. + +%prep +%setup + +%build + +%define my_unitdir /tmp/ + +# New RPM defines _rundir, usually as /run +%if 0%{?_rundir:1} +%else +%define _rundir /var/run +%endif + +# New RPM defines _udevrulesdir, usually as /usr/lib/udev/rules.d +%if 0%{?_udevrulesdir:1} +%else +# This is the old path (eg for C6) +%define _udevrulesdir /lib/udev/rules.d +%endif + +# Pass all of the rpm paths directly to GNUInstallDirs and our other defines. +%cmake %{CMAKE_FLAGS} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \ + -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ + -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \ + -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \ + -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \ + -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \ + -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \ + -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ + -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{my_unitdir} \ + -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \ + -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \ + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \ + -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir} \ + -DCMAKE_INSTALL_PERLDIR:PATH=%{perl_vendorlib} +make -s %{?_smp_mflags} + +%install +DESTDIR=%{buildroot} make install + +%if 0%{?_unitdir:1} +rm -rf %{buildroot}/%{_initrddir}/ +%else +rm -rf %{buildroot}/%{my_unitdir}/ +%endif + +%files +%doc %{_mandir}/man*/* +%{_bindir}/* +%{_includedir}/* +%{_libdir}/lib*.so* +%{_libdir}/libibverbs/* +%{_libdir}/ibacm/* +%{_libdir}/rsocket/* +%{_libdir}/pkgconfig/*.pc +%{_sbindir}/* +%{_libexecdir}/* +%{_udevrulesdir}/* +%{_udevrulesdir}/../rdma_rename +%doc %{_docdir}/%{name}-%{version}/* +%if 0%{?_unitdir:1} +%{_unitdir}/* +%else +%config %{_initrddir}/* +%endif +%config %{_sysconfdir}/iwpmd.conf +%config %{_sysconfdir}/srp_daemon.conf +%config %{_sysconfdir}/libibverbs.d/* +%config %{_sysconfdir}/rdma/modules/* +%{perl_vendorlib}/IBswcountlimits.pm +%config(noreplace) %{_sysconfdir}/udev/rules.d/* +%config(noreplace) %{_sysconfdir}/infiniband-diags/error_thresholds +%config(noreplace) %{_sysconfdir}/infiniband-diags/ibdiag.conf +%{_sysconfdir}/modprobe.d/* From patchwork Tue Jul 23 19:01:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055187 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 AABAE14F6 for ; Tue, 23 Jul 2019 19:11:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B1AF28684 for ; Tue, 23 Jul 2019 19:11:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F7282872E; Tue, 23 Jul 2019 19:11:35 +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 808BC28725 for ; Tue, 23 Jul 2019 19:11:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728441AbfGWTLd (ORCPT ); Tue, 23 Jul 2019 15:11:33 -0400 Received: from mail-qt1-f172.google.com ([209.85.160.172]:37982 "EHLO mail-qt1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLd (ORCPT ); Tue, 23 Jul 2019 15:11:33 -0400 Received: by mail-qt1-f172.google.com with SMTP id n11so42966741qtl.5 for ; Tue, 23 Jul 2019 12:11:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=F+7An6ChOa8ZnFVYb7cHZW+1mye1pJH1wLwrfaJrMB0=; b=Bg/UYAseTfS5bemsVA4fcn6KTAC8eXwpacb49bZqTcJCynp5/rUOxUS+wD3ldIUq13 WM4TqE8Ta7oe1DR1wQPaQuMtbQK1/zi6CWx2NUNfQoWmVh3YgMntjkVzDA3UgeU1J9ra PXawUXkq8QDaC/4cYeXOk6oufQUcKSSicMiv6gMio4dDI6Dmcxi2FdTxFdMJMHZP5HHI JP1RCLSOUittqgrcoZB7bO90tPMf2/j0nkF0wj2+WrkEEQ+/HIPd5liRNfweHuXFLR1t mzSCZVVdUDYYq8+9edpwT9zNXNS9JN62ULQQJfYE1Jar6WGMfHCeWgQEEWFjjT1z3kgC 7YnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=F+7An6ChOa8ZnFVYb7cHZW+1mye1pJH1wLwrfaJrMB0=; b=eD18BRVo+MbbfVQGawFKDk0BZTot5RSc+FNcLOkPCV3zuPiNQQmwo0uW/Z00QQm2f/ SNGnjBYLPHTyjQkahDCNRKBqyEfPFKt2wPjW5S2Hh/WjyI6icMrxzWyhP13EcX83uX1x HbDg5/CDzrfG+3T1dnHvPb6eDUsZA2jNSWAm8iB6POSxl0EaLVBEb9tPi1PtMws/HPSP Q3SIakumVAnzFkeCIHCE2FdjybHynmyUA/MdM+HV0tLgi7C9W2tYTr5Ij8AtfRCKXuhC ZMqr5yDZCwas6wTqDlrTVBiyci2pSaukOH6BKEGqZp16XyjRRGotKzyH85jhiIr/m3d9 Xu2g== X-Gm-Message-State: APjAAAUwLUkANZqEVCPnGXVJv/V/Wsi8R3OgHhJgBgNxPeGUdm2BfYkz IavLBVwdPP2QkNtXxzH/lFGBLZUza1h/Kw== X-Google-Smtp-Source: APXvYqy0n0lNRhjAL+JGOyziFE6LJHuSQ5q2NLEp/CrDS+0Fyl20WsZ96SktznVzlY3Np10egwVD0w== X-Received: by 2002:ad4:498b:: with SMTP id t11mr57333813qvx.139.1563909092511; Tue, 23 Jul 2019 12:11:32 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id v17sm25287534qtc.23.2019.07.23.12.11.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:31 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00045P-UU; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 17/19] build/azp: Run lintian over the bionic .debs Date: Tue, 23 Jul 2019 16:01:35 -0300 Message-Id: <20190723190137.15370-18-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Lets look for errors as we go. Signed-off-by: Jason Gunthorpe --- buildlib/azure-pipelines.yml | 4 ++++ buildlib/cbuild | 1 + 2 files changed, 5 insertions(+) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 6a69e940a5b19e..153d437d8e81e9 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -119,6 +119,10 @@ stages: set -e fakeroot debian/rules binary displayName: clang 8.0 Bionic .deb Build + - bash: | + set -e + lintian ../*.deb + displayName: Debian Lintian for .deb packages - job: SrcPrep displayName: Build Source Tar diff --git a/buildlib/cbuild b/buildlib/cbuild index e7065e3e7d8d2d..c9522841dc1b8e 100755 --- a/buildlib/cbuild +++ b/buildlib/cbuild @@ -451,6 +451,7 @@ class azure_pipelines(APTEnvironment): "libnl-route-3-dev", "libsystemd-dev", "libudev-dev", + "lintian", "make", "ninja-build", "pandoc", From patchwork Tue Jul 23 19:01:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055193 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 5C1806C5 for ; Tue, 23 Jul 2019 19:11:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D29E28684 for ; Tue, 23 Jul 2019 19:11:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4178C2872E; Tue, 23 Jul 2019 19:11:38 +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 BDF2A28684 for ; Tue, 23 Jul 2019 19:11:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729250AbfGWTLh (ORCPT ); Tue, 23 Jul 2019 15:11:37 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:44709 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbfGWTLg (ORCPT ); Tue, 23 Jul 2019 15:11:36 -0400 Received: by mail-qk1-f196.google.com with SMTP id d79so31900335qke.11 for ; Tue, 23 Jul 2019 12:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aNRHRL2bXDOUvPbzZoPO7YQ0ir+RwwwIW65S09T0+nI=; b=W1aBQ5F7/Z6ol6vwdgDv1hBSQdaEy8iMd241PksDdWlfPpoG5Tyi4w7T08hixiD7ws maFMeYAp+J2VIb+yNwW+uJENe5LUDSypiPOmuKo/eKJFo5ynEGriiK3n4sJs3ehhJMoD I3n/DtcHX7VJL9M5p49P4IDUiKj/CPRfOisjw6AV3v8EfyDsf6qRoOM2DgdFyvXG77cu yUjJFvtjZXNMP6n2T1If0V6z+CyKfwe45XsGbkmpoNqAJ39NPEN9+nlO69UG4eaJB3jF tfRSbCzA2mVoik/p2zkRr2cPmXLP7QSuDVYqveRbHesWygAMV3VjjhvoHu60AD/7YGts uSTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aNRHRL2bXDOUvPbzZoPO7YQ0ir+RwwwIW65S09T0+nI=; b=syH9MHFUpkrHtsWPdQSa5G7VEE4ExWPec+3+5Cyk+BLrOfNU1Nyg6hZZrrhrAv5YSP YFIzEuuyw5YZ924+cDkTz6DpU8C8l1IM1E0cB8b2mOUhaQPIY9kqDMHnEpVjkqc4oQQg A6AfiZRrFjVwFgB9c9+u82c8dN6KViebUgsXn550ZUixDm0/U3pNAWQtevCTOcLEGmxW KOOjPsIGZF/V/TefuWH5VFA+EVMlUaP+vCEqksUOnmvjNZnEFaVRohSABORePjZyhfh1 3OMNc/g57x2NBlbUH8+fItC/OKpTlRgrv4xNQ1x5oUBdJbxLsaZEOvTeyINOnsgDOued S+bQ== X-Gm-Message-State: APjAAAU9xTRDve1a7gGxnFzoHqHLPMgg5le2kJ/CGyo35PyuA0WdwCGM JZRWh9fBaVqA8vVSxRN0bO436Bi59dCpig== X-Google-Smtp-Source: APXvYqzHdz6MQqTM+b+MQ9l7Bci4+619HIKtXCGvnYcXIDS35KIFVZIAdtZX9EU9Npg8Ln1SgR6AXQ== X-Received: by 2002:a37:4ac3:: with SMTP id x186mr49440029qka.138.1563909095568; Tue, 23 Jul 2019 12:11:35 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id z8sm19099189qki.23.2019.07.23.12.11.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:35 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02e-00045V-Va; Tue, 23 Jul 2019 16:01:40 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 18/19] build: Use the CMake variable -DENABLE_WERROR to turn on WERROR mode Date: Tue, 23 Jul 2019 16:01:36 -0300 Message-Id: <20190723190137.15370-19-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe This way the flag can be passed through EXTRA_CMAKE_FLAGS to rpmbuild and debian/rules instead of hacking it in via sed/etc. Signed-off-by: Jason Gunthorpe --- CMakeLists.txt | 5 +++++ buildlib/azure-pipelines.yml | 24 ++++++++++-------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9353ddbc86d1e..9bb58a9b803667 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -538,6 +538,11 @@ RDMA_DoFixup("${HAVE_STATIC_ASSERT}" "assert.h") RDMA_AddOptCFlag(CMAKE_C_FLAGS HAVE_C_WSTRICT_PROTOTYPES "-Wstrict-prototypes") RDMA_AddOptCFlag(CMAKE_C_FLAGS HAVE_C_WOLD_STYLE_DEFINITION "-Wold-style-definition") +if (ENABLE_WERROR) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") + message(STATUS "Enabled -Werror") +endif() + # Old versions of libnl have a duplicated rtnl_route_put, disbale the warning on those # systems if (NOT NL_KIND EQUAL 0) diff --git a/buildlib/azure-pipelines.yml b/buildlib/azure-pipelines.yml index 153d437d8e81e9..4eef7408af027c 100644 --- a/buildlib/azure-pipelines.yml +++ b/buildlib/azure-pipelines.yml @@ -43,7 +43,7 @@ stages: set -e mkdir build-gcc9 cd build-gcc9 - CC=gcc-9 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 + CC=gcc-9 cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_STATIC=1 -DENABLE_WERROR=1 ninja displayName: gcc 9.1 Compile @@ -62,7 +62,7 @@ stages: mv CMakeLists.txt CMakeLists-orig.txt grep -v "# NO SPARSE" CMakeLists-orig.txt > CMakeLists.txt cd build-sparse - CC=cgcc CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + CC=cgcc cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 -DENABLE_WERROR=1 ninja | grep -v '^\[' | tee out # sparse does not fail gcc on messages if [ -s out ]; then @@ -75,7 +75,7 @@ stages: set -e mkdir build-clang cd build-clang - CC=clang-8 CFLAGS="-Werror -m32 -msse3" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + CC=clang-8 CFLAGS="-m32" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 -DENABLE_WERROR=1 ninja displayName: clang 8.0 32-bit Compile @@ -85,7 +85,7 @@ stages: echo "#error Fail" >> util/udma_barrier.h cd build-gcc9 rm CMakeCache.txt - CC=gcc-9 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both + CC=gcc-9 cmake -GNinja .. -DIOCTL_MODE=both -DENABLE_WERROR=1 ninja mv ../util/udma_barrier.h.old ../util/udma_barrier.h displayName: Simulate non-coherent DMA Platform Compile @@ -94,7 +94,7 @@ stages: set -e mkdir build-arm64 cd build-arm64 - CC=aarch64-linux-gnu-gcc-8 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + CC=aarch64-linux-gnu-gcc-8 cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 -DENABLE_WERROR=1 ninja displayName: gcc 8.3 ARM64 Compile @@ -102,18 +102,14 @@ stages: set -e mkdir build-ppc64el cd build-ppc64el - CC=powerpc64le-linux-gnu-gcc-8 CFLAGS="-Werror" cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 + CC=powerpc64le-linux-gnu-gcc-8 cmake -GNinja .. -DIOCTL_MODE=both -DNO_PYVERBS=1 -DENABLE_WERROR=1 ninja displayName: gcc 8.3 PPC64EL Compile - # When running cmake through debian/rules it is hard to set -Werror, - # instead force it on by changing the CMakeLists.txt - bash: | set -e - echo 'set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")' >> buildlib/RDMA_EnableCStd.cmake - sed -i -e 's/-DCMAKE_BUILD_TYPE=Release/-DCMAKE_BUILD_TYPE=Debug/g' debian/rules sed -i -e 's/ninja \(.*\)-v/ninja \1/g' debian/rules - debian/rules CC=clang-8 build + debian/rules CC=clang-8 EXTRA_CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1" build displayName: clang 8.0 Bionic Build - bash: | set -e @@ -164,15 +160,15 @@ stages: centos7: CONTAINER: centos7 SPEC: redhat/rdma-core.spec - RPMBUILD_OPTS: + RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1' fedora30: CONTAINER: fedora SPEC: redhat/rdma-core.spec - RPMBUILD_OPTS: + RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1' leap: CONTAINER: leap SPEC: suse/rdma-core.spec - RPMBUILD_OPTS: --without=curlmini + RPMBUILD_OPTS: --define 'EXTRA_CMAKE_FLAGS -DCMAKE_BUILD_TYPE=Debug -DENABLE_WERROR=1' --without=curlmini container: $[ variables['CONTAINER'] ] steps: - checkout: none From patchwork Tue Jul 23 19:01:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Gunthorpe X-Patchwork-Id: 11055185 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 5C9106C5 for ; Tue, 23 Jul 2019 19:11:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B15728684 for ; Tue, 23 Jul 2019 19:11:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DD0028732; Tue, 23 Jul 2019 19:11:35 +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 2790628684 for ; Tue, 23 Jul 2019 19:11:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728954AbfGWTLd (ORCPT ); Tue, 23 Jul 2019 15:11:33 -0400 Received: from mail-qt1-f171.google.com ([209.85.160.171]:37979 "EHLO mail-qt1-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728441AbfGWTLd (ORCPT ); Tue, 23 Jul 2019 15:11:33 -0400 Received: by mail-qt1-f171.google.com with SMTP id n11so42966688qtl.5 for ; Tue, 23 Jul 2019 12:11:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ziepe.ca; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WeLeHSW5IWfJdV5bVLUG5dsIV+T04rqjlm+2/mArvng=; b=MuPSKhOrMkztA/YpagsNpBrCe/s4lb+iTFuCrvx5UyM8Laq7Tp9c/o318Evt6+A7Ff raOdkq72dQkY6/po3SW/ENa4lv5YvEuheOf1bir5DAwXCojcS+7Zk7OG+lfcEkgqJ6c/ f7w4JV9nqxQddCOk5UnxzJN0i3zUrfsJm19WkEfT0asOXJ3jrELCw+YxwQ9YiFruxO/W WMPeOnYXcVCfBhzsWLGlpvBGTjoDufvtbZdMfbveRbae6XVCM6jx6xkF06zBoy0Agkvp bVj7P6q6LZA5CEobxpDx45gaI3dDWHc86jjsvseNgSdk662U/4oIaKef+1nifin9r6Qr 2BGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WeLeHSW5IWfJdV5bVLUG5dsIV+T04rqjlm+2/mArvng=; b=tho+XWi1zBfVZsK3EJpMcdneMEq6bEi7kNQ2cogy/700AJrBJ/SmnoIXy1Q5OHtWga 21jyacq+bJDnFAsXK+7nCdt38Aa3OpHCh1Y/fjq1/ZyFdwNIKX94asNp5jrl+SpH0ZjF 5p9X4LvvsZKiqDkZYIkpOjObYZxrhksEVClacOOH3Xl4lD3ywBZXExHM9g9jL1T325fN fBPaCen3sXyi6L6hHV/PcUd5HjmT+xXjNmU6QVMwdb0qxFsbZOL8iOJuNeSCgwtcgBPG KbanBMxqP+GPPpNqr8oO86wv4dlYTgFi9K2i+N/PY6KbthSIhFprKYj8c4GOUo1BPsez ufxg== X-Gm-Message-State: APjAAAULzrfdZT+UttILXUrKTqH0t4fXndOaSVsvchydkaT7qec025ML 99IoLo400XHGUYpyq9QyGXBOnyrD+luERg== X-Google-Smtp-Source: APXvYqxDD0/iqTQXR/B4n/DKM1iygVKBoohZ3RWLcU3T4N0ZeSt9BmHmXUMV4nCO3sn0jFsJon+rYg== X-Received: by 2002:ac8:2bd4:: with SMTP id n20mr55312288qtn.131.1563909091246; Tue, 23 Jul 2019 12:11:31 -0700 (PDT) Received: from ziepe.ca (hlfxns017vw-156-34-55-100.dhcp-dynamic.fibreop.ns.bellaliant.net. [156.34.55.100]) by smtp.gmail.com with ESMTPSA id r36sm23191245qte.71.2019.07.23.12.11.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jul 2019 12:11:30 -0700 (PDT) Received: from jgg by mlx.ziepe.ca with local (Exim 4.90_1) (envelope-from ) id 1hq02f-00045b-0L; Tue, 23 Jul 2019 16:01:41 -0300 From: Jason Gunthorpe To: linux-rdma@vger.kernel.org Cc: Jason Gunthorpe Subject: [PATCH rdma-core 19/19] build/azp: Have Azure Pipelines create releases when tags are made Date: Tue, 23 Jul 2019 16:01:37 -0300 Message-Id: <20190723190137.15370-20-jgg@ziepe.ca> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190723190137.15370-1-jgg@ziepe.ca> References: <20190723190137.15370-1-jgg@ziepe.ca> MIME-Version: 1.0 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 From: Jason Gunthorpe Build a draft release and push the source .tar.gz to GitHub's releases page. For some reason this relies on an Azure Pipeline's user-specific service connection instead of the existing app installation: https://github.com/MicrosoftDocs/vsts-docs/issues/4260 This is done in a dedicated YAML file as it runs with a separate configuration on AZP that authorizes it to use the write-access service connections. Signed-off-by: Jason Gunthorpe --- .travis.yml | 17 ---------- buildlib/azure-pipelines-release.yml | 48 ++++++++++++++++++++++++++++ buildlib/github-release | 7 ---- 3 files changed, 48 insertions(+), 24 deletions(-) create mode 100644 buildlib/azure-pipelines-release.yml delete mode 100755 buildlib/github-release diff --git a/.travis.yml b/.travis.yml index 82f16d65e0a646..e00b0165215b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,20 +43,3 @@ before_script: - http_proxy= pip3 install cython script: - buildlib/travis-build - - buildlib/github-release -deploy: - # Deploy assets to Github releases - # https://docs.travis-ci.com/user/deployment/releases/ - provider: releases - api_key: - # This is encrypted OAth token generated by - # Travis CLI tool (travis setup releases) limited to specific repo. - secure: ok/WMzFgsSnk+NZ850QEUESHRfJ4Ae7T8eA4dcx4fuw2RqybAh8wjxrLP5GKR27WrzB3hKHHTi7fgE0VtBY024kGJ/+wlQXHN1p89JvCiQlGOKkxy5YIlS4GUhwwkqgoU+hmifxl1i+9yCuowHPIM4WoP+NR+IZgvMahlrdPCS2OleFtrqyaHZbC/Usdt0WZLeQzG+rVLec/NvPnVOn81e17yuAuluHAzu+qcV94szqe/zwDzG8RUUKXaeDEQ3JQja4bCLL/kTkWR8JGsfwvcqc9Ut4Ry2b7uEWp5/FIcxUGWviKRgRzEdcT40iMMiJbIrH7gYp66Ymr/dypqUfc4u/xSb4AmpTMcYGUXJxsdzKyL6d/7HbuHIIVc5o1V/L5mdaIjeO5KjTFjMMD5KoSXfBlNIGk2as1JD/99lxJ3VlpQGwI5390+Tyl8o4Ao4aBXSCG96PDK4+UkYFht/wrw+UoYdV07u3x7zz21O3N3Lu5733hDvcvyOW6uIzoeLQ5O62/3Pq+DOFRs/nnRiW8/gjIkEQAyj/GGxw/taslpFJFcdVt/MSueV4t5OCI2YdGA/NxG/c4FIGy+dntV5BB6Gld8KkP/PP74yzJ1o/PRDRExTbsQzrdisDrVIf0r4pxTTsw1gXRE5r6S0tQ5aNoXAQ5h4xiwAIGqqBF4HESJjA= - file: rdma-core-*.tar.gz - # Allow asterisks in file names. - file_glob: true - skip_cleanup: true - # Limit scope of deploy to specific repo. - on: - repo: linux-rdma/rdma-core - tags: true diff --git a/buildlib/azure-pipelines-release.yml b/buildlib/azure-pipelines-release.yml new file mode 100644 index 00000000000000..fd5e4a1e43270d --- /dev/null +++ b/buildlib/azure-pipelines-release.yml @@ -0,0 +1,48 @@ +# See https://aka.ms/yaml +# This pipeline runs to produce GitHub releases when tags are pushed. The +# pipeline is never run from a PR and has access to all the build secrets, +# including write permission to GitHub. + +trigger: + tags: + include: + - v* + +resources: + containers: + - container: azp + image: ucfconsort.azurecr.io/rdma-core/azure_pipelines:25.0 + endpoint: ucfconsort_registry + +stages: + - stage: Release + jobs: + - job: SrcPrep + displayName: Build Source Tar + pool: + vmImage: 'Ubuntu-16.04' + container: azp + steps: + - checkout: self + fetchDepth: 1 + + - bash: | + set -e + mkdir build-pandoc artifacts + cd build-pandoc + CC=gcc-9 cmake -GNinja .. + ninja docs + + cd .. + python3 buildlib/cbuild make-dist-tar build-pandoc + displayName: Prebuild Documentation + + - task: GithubRelease@0 + displayName: 'Create GitHub Release' + inputs: + githubConnection: github_release + repositoryName: linux-rdma/rdma-core + assets: ./*.tar.gz + action: create + isDraft: true + addChangeLog: true diff --git a/buildlib/github-release b/buildlib/github-release deleted file mode 100755 index 8fc536fb8b1074..00000000000000 --- a/buildlib/github-release +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -e - -if [[ $TRAVIS_TAG == v* ]] && [ "$TRAVIS_OS_NAME" = "linux" ]; then - buildlib/cbuild make-dist-tar --tag "$TRAVIS_TAG" build-travis -fi