From patchwork Thu Oct 5 23:00:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 115004 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp1112137qgn; Thu, 5 Oct 2017 16:00:51 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBsqcYdgKuMOoTDrmmn1YR5WKR51tR18CKDGOSWSjxFz/7GjrMRr6w82OlPSmWQshvScNRd X-Received: by 10.200.57.164 with SMTP id v33mr374265qte.204.1507244451211; Thu, 05 Oct 2017 16:00:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507244451; cv=none; d=google.com; s=arc-20160816; b=Juc1m/ZD0mrQ+Hwk1Vz+VtZNATMqvHOJyRIv124/IblomeF7pyXSbh8PqvNBoAgZ6E BZYbjsSmQq5fuDy5WingJ1zP2Daeb1VLzb1TU+xPi6/cqFrBhPbpPw6oN5meTGlqutq1 VYSfEwE/1KFxHCSoNqtj7m3ZcB+bYipJJYxhuRbHj+Pf8/YNeq5ElN5FU06mEWnsw8iA hCG4Heif0AssUBqmWbzGOpfveIAle4LPTF9c0IqMoph9myYHpEMu/CbyXGzMSkOvE91O XDGkMRDsuCkdGFYvyh9dtWMxI+8HNDev9d65eTxxGZjxdN8BZCSACyeuo1UVxU94ZkU4 fIoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=BDScnsSwEQBvT72DZHMDpNfdApDru7dE82vdzdrnzJc=; b=VPHf+VPMav6QuUPGbctNCyZUTC4TCRFFuibAM85VS5EnUlzcS4XWBOxnP/Bj/jM+ea 5n+a3tEfAucGkWb4mivYuMUA9ZKHkBk+9J+DZfj7dDN2aHlauFyJxGncH5JgHikMp7F2 Va4MAYpVv58PMZkktkBqar7O3Wvxkm5VBJXbpa1H7W6RhXf4DF6ZKbWj0so34snApEja 2+oHOGaXAHXGV7b3QwxtvNJoFkEOyCBGDFpEtUlbhezwo0ZMmSlEDO6JUNU3tilw1gwY hXgHd4xwt0xUrTjbnWqQ5LRUjSfLnbonF2/unmjpsDrHNLmWmcIYND0BOB3UtjtjWcC0 2NzA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id a102si126054qka.352.2017.10.05.16.00.51; Thu, 05 Oct 2017 16:00:51 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id E41FD644AF; Thu, 5 Oct 2017 23:00:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 7BEAD644B0; Thu, 5 Oct 2017 23:00:22 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 781D4644A8; Thu, 5 Oct 2017 23:00:19 +0000 (UTC) Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by lists.linaro.org (Postfix) with ESMTPS id 1AC946449D for ; Thu, 5 Oct 2017 23:00:18 +0000 (UTC) Received: from mxback10g.mail.yandex.net (mxback10g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:171]) by forward102p.mail.yandex.net (Yandex) with ESMTP id A8BD443049B7 for ; Fri, 6 Oct 2017 02:00:16 +0300 (MSK) Received: from smtp1j.mail.yandex.net (smtp1j.mail.yandex.net [2a02:6b8:0:801::ab]) by mxback10g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id yieMej2Qfq-0G6unYE1; Fri, 06 Oct 2017 02:00:16 +0300 Received: by smtp1j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id lC7tmgRC3e-0Gq0Yhwr; Fri, 06 Oct 2017 02:00:16 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Fri, 6 Oct 2017 02:00:09 +0300 Message-Id: <1507244409-362-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507244409-362-1-git-send-email-odpbot@yandex.ru> References: <1507244409-362-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 220 Subject: [lng-odp] [PATCH v3 1/1] travis: fix netmap module loading X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Dmitry Eremin-Solenikov Travis script will insmod netmap.ko only it was rebuilt during this session, which is wrong. Split the ifs, so that module loading does not depend on the cache contents. Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 220 (lumag:fix-netmap) ** https://github.com/Linaro/odp/pull/220 ** Patch: https://github.com/Linaro/odp/pull/220.patch ** Base sha: 52cfe7ba6d2541cf5ee464e46e91b2da5efe1497 ** Merge commit sha: de27e5abdc9e16a982bec2ca4d4266b403285c50 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 395feb0ef..5d0325736 100644 --- a/.travis.yml +++ b/.travis.yml @@ -167,13 +167,15 @@ install: # Netmap pktio - | - if [ -z "$CROSS_ARCH" -a ! -f "netmap/LINUX/netmap.ko" ]; then - git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git - pushd netmap/LINUX - ./configure - make - sudo insmod ./netmap.ko - popd + if [ -z "$CROSS_ARCH" ]; then + if [ ! -f "netmap/LINUX/netmap.ko" ]; then + git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v11.2 https://github.com/luigirizzo/netmap.git + pushd netmap/LINUX + ./configure + make + popd + fi + sudo insmod ./netmap/LINUX/netmap.ko fi script: