From patchwork Thu Oct 5 20: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: 114994 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp969983qgn; Thu, 5 Oct 2017 13:00:32 -0700 (PDT) X-Google-Smtp-Source: AOwi7QARek19AIBMhogqgwsmoleWRc7tey4cB/bqJhE22Z2V90JVJaex3+naFQ4g8kSRb3dYz6Es X-Received: by 10.55.119.70 with SMTP id s67mr31778414qkc.211.1507233632007; Thu, 05 Oct 2017 13:00:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507233632; cv=none; d=google.com; s=arc-20160816; b=qTEFH2mJ2V+EqGy3KkwVD0ru2BMUy7z/xM240ML8gfx6c+0PIB2KcmmFmRXsU1YoC4 L9fthW779ATO7Rdzw36xdmpUerPIbjIVxpKZ0iybb4DGlOTWydG/bGshI0vl/uUkyaNI bvjmXf8dVPCzzEfFcE8di/Qtv2hO4lfqb8mDFxcOWm2dlRbKDZM0EN++t3ktSkAyo4HE M1wNiOtj8J1BnYJEAGWooU9Lj5SfCGw393mV7rmjbmFNFgK8Zaa4Eduof1MENreVFxT1 LPml2mFU9rtQQokK20pihmW+nmwyZ2OAP5HpPkGPPcYLV65XDJIQSHeXE3f7d5nszzk/ h37Q== 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=dSJFBK3dC/sD5Re95YATAaRmWZbI12U7yb+g3b7uTdI=; b=mi+ZVGfaySzZt/8VxL6tX4gx0rfMpsRUOys5OG0c72L8DWMTC8i9dEb20m4xZcjKqU XkfwDIQb9DKZNYDOzXMp65aY+Kswep4RG4alhS7OPUBjeHYV5zqI7EgnK46XBvvHXEVp 3hFKfkI8+uMwy12DJwGpCYtXgsESAja4s38GgmFfXdezJqE7Ydmc9VEuSHzS0QKgL78H sGAu/H5IRBMICm+E9UVIja5PAJyevhosD/PSw6Pz++bXbgWiXrd7b+HZ4wA/GcQ4nLZv gDZmJGIErErWh/SNxEGGV19IIMgZVMKR8wrc9gknJSVy570KsqaVhs3tztWxBCwzYTN9 eg0g== 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 s70si1249811qka.181.2017.10.05.13.00.31; Thu, 05 Oct 2017 13:00:31 -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 F15F8644A3; Thu, 5 Oct 2017 20:00:30 +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,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 A4BAC60916; Thu, 5 Oct 2017 20:00:26 +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 C32486449E; Thu, 5 Oct 2017 20:00:24 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id DC55160916 for ; Thu, 5 Oct 2017 20:00:21 +0000 (UTC) Received: from mxback3o.mail.yandex.net (mxback3o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1d]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 1F6CA184DCE for ; Thu, 5 Oct 2017 23:00:20 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback3o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 8koMNSOTnd-0Jiabs28; Thu, 05 Oct 2017 23:00:20 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id RgBzoF6LBv-0J9ulXcm; Thu, 05 Oct 2017 23:00:19 +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 23:00:06 +0300 Message-Id: <1507233606-30722-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1507233606-30722-1-git-send-email-odpbot@yandex.ru> References: <1507233606-30722-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 220 Subject: [lng-odp] [PATCH v2 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: 9ad8ba88b41e682e8a00b7b9de1a8b454bc96b87 **/ .travis.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 395feb0ef..e8ad60efe 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: