From patchwork Fri Jan 19 02:00:08 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: 125069 Delivered-To: patch@linaro.org Received: by 10.46.66.141 with SMTP id h13csp83970ljf; Thu, 18 Jan 2018 18:02:57 -0800 (PST) X-Google-Smtp-Source: ACJfBose4ACBo237kXQPoO4nrlnEswpOUUHz31ZUQEXn/To2b7MkINL6NA8tyf5GpJ0Ht88myWJC X-Received: by 10.55.1.207 with SMTP id u76mr51858380qkg.344.1516327377172; Thu, 18 Jan 2018 18:02:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516327377; cv=none; d=google.com; s=arc-20160816; b=ff6qYOZlVFQxdPwXW9PRz7UhmYiZUHj3rQPwJ6+H7pPnfVKpndJw1x7SElug/iFP75 T45H+caX5+27mI8vj0Fl//7cuWP1gl2djzxAT4MjgjbcEsHET5k332Oj4TEQquz0Ztqh bHuwxnrFFb1yQBNlc0o/b1rABagZUFTHoayICsgXTLqKFOBGIZsWZPG2xS+mctRvttCN HPEQClipxcqo29EGi8i1lhoKlhamj4knjhXCTMIZ6f6g2dIFsfksz8be2KzY+2ThDL7I BwXVQiEr1onUB2DBIXJ9xsYwOhf4zaR44fgOlwYn6ZbOopqWo0AeLKX/dG16kNcy211U CVIQ== 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=XyMswqb2Swf3YZtwTHykUAhbMw42Shuc34A1SGIh0+w=; b=0Fg3DqR9EaxqBPkjVZxeDCbVIr7QHwqnEAj9Xn/aIJj7vSM/yV55BS6w2J1fPJ9Ahr ru0H0kz15Z+rJjFcMT2F7kjRNmCRs/tJ5I4efQceCPjj9vL9eBJFuYxCZIgBNQ0WA7ID +AsMXHoz9Cm/Wfxufc/HBQDW7k9ziDcsxEEmyV9RRV0OHVCsoBiaHxOf+j2rT0OErmbG RYxFZ4wQo/ksTx+/Ymvvy/dhX7PVf7/XjffXk7WQTvMEII53w7tXoaMjWCgAQAFrwNSD bUh1HE1ZJsqDxbDJWkOUHZfi9L5a0ojLdlHDFZpFrfaeCf1C+8Bcq/u9hOj7oFjz+c4G 6hGg== 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 t76si8682696qkt.274.2018.01.18.18.02.56; Thu, 18 Jan 2018 18:02:57 -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 D4806627AF; Fri, 19 Jan 2018 02:02:56 +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 D237D627BC; Fri, 19 Jan 2018 02:02:08 +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 21F9C627CC; Fri, 19 Jan 2018 02:02:05 +0000 (UTC) Received: from forward105o.mail.yandex.net (forward105o.mail.yandex.net [37.140.190.183]) by lists.linaro.org (Postfix) with ESMTPS id B170C6173D for ; Fri, 19 Jan 2018 02:01:02 +0000 (UTC) Received: from mxback8g.mail.yandex.net (mxback8g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:169]) by forward105o.mail.yandex.net (Yandex) with ESMTP id 4276C4444641 for ; Fri, 19 Jan 2018 05:01:01 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback8g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id L8CEMKhgOJ-11t0NqNi; Fri, 19 Jan 2018 05:01:01 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id MJUZq2jn8X-0sJeADQR; Fri, 19 Jan 2018 05:00:54 +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, 19 Jan 2018 05:00:08 +0300 Message-Id: <1516327210-19457-5-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> References: <1516327210-19457-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 402 Subject: [lng-odp] [PATCH v3 4/6] 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. Signed-off-by: Dmitry Eremin-Solenikov Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 Signed-off-by: Dmitry Eremin-Solenikov --- /** Email created from pull request 402 (lumag:travis-upd) ** https://github.com/Linaro/odp/pull/402 ** Patch: https://github.com/Linaro/odp/pull/402.patch ** Base sha: 5a4502fc6bc53e6503169da3028f456b64811a0b ** Merge commit sha: bec38d48297ebf78da7d67c986b91604e4597080 **/ .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd571f4f3..3f6f70795 100644 --- a/.travis.yml +++ b/.travis.yml @@ -193,7 +193,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 @@ -217,7 +218,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) 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