From patchwork Thu Oct 5 18:00:06 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: 114964 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp863388qgn; Thu, 5 Oct 2017 11:01:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBD4fY5LTC/ZJ/GLZCfhytfNwPvLy43nfPOOOjaPlPs55R7RFTRyUp7traMfjab7hkw1mqa X-Received: by 10.55.150.69 with SMTP id y66mr31850103qkd.28.1507226495384; Thu, 05 Oct 2017 11:01:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507226495; cv=none; d=google.com; s=arc-20160816; b=YAxynrUDRWNJ4amRRRhFYzHk20m1w3VCueGQKqS0kjfyf/YaLJTvammac/XiRSUkBR wRtxx0j28nvtTqla12i4ZapFTuzpXyxVAsZvVXHHHWiqsVYFNdjsNrhbvA4hOyDMy3Im wBIU425FHdnRpm2KOuqpBgK1VgmVKBz20GB0cnFj9LNKVq6BFFb2/uR6wmPzzBi8+vXJ uU5gJt5O2eK7mermOU1wGJsZMvwQahatm8X3qVAzXSQUKzrNfQYw2Okp0mFzIA2szbVH QjvZNpHqwAtJWheIqmh5KX7s4/Nf3SsYeqwAsMH6KZZBU42EvdX5r6/qfNIDsx0d+o0b YVrA== 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=B9rFw3WT7lTXnh+wTMkrlJTwYY0P866CcL6tChwhN58=; b=OiFf6zOUvju5OQiOMbXKFbMZuQ/bRGzxvFgmotVQrtc9oIQuB5CNX0HWq/yNjBW/RE HaIGbYFPDPeZVAsIBUi9lET60isALj/kzaGeNs37KMF5SB2pE9HUt0TLPXiremC51s3q 8l98J7B/gEx9JCsuT7JBCNr9ZVHaCRcRa38msCwaVMh+f/lq6FxxYtdMCmxgr/rlL7A2 gx2H/NCilurbQ4qqXKpUW+KOn/Yb+QJZ/WVRT8eRhAX04O4ea4jSjLpPUTr8+wW9rcwR 3HMtsrzm6kCFj/0A81hFBIrH5YVqYTjOshHKU0mjeVz/kaGkhQ0NzbUJLWT29PmAlVun 0mpQ== 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 z6si4635871qka.0.2017.10.05.11.01.35; Thu, 05 Oct 2017 11:01:35 -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 EED65644CE; Thu, 5 Oct 2017 18:01:34 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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 5C161644A1; Thu, 5 Oct 2017 18: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 6925760C8F; Thu, 5 Oct 2017 18:00:17 +0000 (UTC) Received: from forward102j.mail.yandex.net (forward102j.mail.yandex.net [5.45.198.243]) by lists.linaro.org (Postfix) with ESMTPS id BE72460C4F for ; Thu, 5 Oct 2017 18:00:14 +0000 (UTC) Received: from mxback5g.mail.yandex.net (mxback5g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:166]) by forward102j.mail.yandex.net (Yandex) with ESMTP id 52FC256046DC for ; Thu, 5 Oct 2017 21:00:13 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback5g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id gdt08gPTWe-0DnWorY3; Thu, 05 Oct 2017 21:00:13 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id w2CQrd6fAB-0C9u4RmE; Thu, 05 Oct 2017 21:00:12 +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: Thu, 5 Oct 2017 21:00:06 +0300 Message-Id: <1507226406-26661-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507226406-26661-1-git-send-email-odpbot@yandex.ru> References: <1507226406-26661-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 220 Subject: [lng-odp] [PATCH v1 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: f539841ee6dc458d982291602348d6edf234f356 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 395feb0ef..a6b9cb0bf 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: