From patchwork Mon Jan 22 16:00:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 125443 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp1232807ljf; Mon, 22 Jan 2018 08:05:20 -0800 (PST) X-Google-Smtp-Source: AH8x224CbNhptEiASWLdccA+Mf2qA18tl/hZy5BY4arwg9pDnJT+cXPzo66wSFTcJdUUoahE62PK X-Received: by 10.55.222.19 with SMTP id h19mr1996768qkj.0.1516637120549; Mon, 22 Jan 2018 08:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516637120; cv=none; d=google.com; s=arc-20160816; b=ShSHwxdwznsrLpBEsU3FeNAoA7y7MutQh59hVX4kc3xAgrUQizCtxirY/U9D9zJAeF zU2/k5m1u9Un6UspALK/SoSucIfWEZC1xOLsKgdb7WQC16UkdFs5ft1kKz3/v2+2UeAS Qxf9GUZNEEau+d+ILq937mt1bIn5czw1TyoIxwL+TCDAShpQ2rRfUlx5fHwjF110XN/A Oijx46fVc2vVEY+23dXrw0Az/Uzlp35Ys6cvAw4f75oFq8vRp1YuDqoLFFw0v16mAI5D PbGUtJccEH9YB9BhjwlmJOTO0noDIEZwWjwQ0J/Jh15hW2+7VbxWbFO59GuYjOSoJOAv 2HpA== 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=UFOihAT1DY9f7rOfYxGwulc1UYliezKgKJYKFENdAuQ=; b=ldS8CRWUrulyJ63lMqBl2sWcZTrLCZrBQ5yZ7LNn4bH++yLqP33GQdxA3LSFBbizT3 MUMbMfRG61R+bgU0tSFwcN/CwXZpDNjgyHdDzy1kgkqARy1Hem26hAI957+L0BmFPWVt kQgbY5NEY9H4cOwtTp8orahd3307pBuZGHsYYHyD1sPZo3TLvsx1k3FULJ8W4lyTi0X2 AsnVC8KFdM/M3Yx+YXUZSQbgX2uiZkHr8cyPVpaySk46AhL4SoeH0LlNGhcrKfKqd7BT zfEUo3x4FY2aNPMBXtbpZgUd2NnoK+UmpM4QhS9Qr2C/aRy6AIhoblk7PPT3H7hH+1an xtxw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id d205si1538465qkc.60.2018.01.22.08.05.20; Mon, 22 Jan 2018 08:05:20 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 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 1992C617CC; Mon, 22 Jan 2018 16:05:20 +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_H2 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 9D82B618E4; Mon, 22 Jan 2018 16:01:21 +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 AB05861741; Mon, 22 Jan 2018 16:01:10 +0000 (UTC) Received: from forward104p.mail.yandex.net (forward104p.mail.yandex.net [77.88.28.107]) by lists.linaro.org (Postfix) with ESMTPS id 43A73617DB for ; Mon, 22 Jan 2018 16:00:24 +0000 (UTC) Received: from mxback4g.mail.yandex.net (mxback4g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:165]) by forward104p.mail.yandex.net (Yandex) with ESMTP id 1A83A182D8D for ; Mon, 22 Jan 2018 19:00:23 +0300 (MSK) Received: from smtp4j.mail.yandex.net (smtp4j.mail.yandex.net [2a02:6b8:0:1619::15:6]) by mxback4g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id X5hfQcUgZA-0Nda2D7a; Mon, 22 Jan 2018 19:00:23 +0300 Received: by smtp4j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Zz0EDOp1oY-0M0iwPVi; Mon, 22 Jan 2018 19:00:22 +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: Mon, 22 Jan 2018 19:00:19 +0300 Message-Id: <1516636822-25091-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516636822-25091-1-git-send-email-odpbot@yandex.ru> References: <1516636822-25091-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 416 Subject: [lng-odp] [PATCH v1 1/4] travis: move --with-dpdk-path out of DPDK build if 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 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 416 (lumag:trav-dpdk-shared) ** https://github.com/Linaro/odp/pull/416 ** Patch: https://github.com/Linaro/odp/pull/416.patch ** Base sha: 3ce9d6ab16d064b0f83508e2f0b2e476d64b15e1 ** Merge commit sha: 03435fd2ad14f3faf8bb7e41c71ef9fc054b8662 **/ .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14bc1b143..f3babf359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -206,7 +206,8 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -n "$TARGET" ] ; then + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -230,7 +231,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + fi + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio