From patchwork Mon May 11 16:40:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Kiss X-Patchwork-Id: 48309 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 092152121F for ; Mon, 11 May 2015 16:43:07 +0000 (UTC) Received: by wizk4 with SMTP id k4sf27648413wiz.2 for ; Mon, 11 May 2015 09:43:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :mime-version:content-type:content-transfer-encoding:errors-to :sender:x-original-sender:x-original-authentication-results :mailing-list; bh=Ydm9lxwBoZx5bPyV7mtvGZxO7+aYD/uWzXpMQy9p1D4=; b=Zn3DWE1lxvgvggWfh7aOUGhgmfvjQhIZiF8cZR5Vn8hd1QZO+1NQvIhsDnD0zlgvF4 MEc7R2g/mHpX8xRvVDOIbgEQpS8/sQCv2Zj65bxofEjPfipEKZsmFJpMviEo4XhpSMKj lnbSY6WMcMMSHeHAoXtgo/M36JlhmSV6GklhBQVzm4GWISAyDrQVCokm+qaVFCI7V1HB RwATTZiY55u3yvvmtGqOG/wqcHaU29p/IAHG1lAqnwwvgoxKOijNSXXW7AIJp1fZOiOk 4IQqODawgLqRF7+sjhOY8LBSWv2vuexCMrHslsEIwnc/ioeytewaqSWn+HyojbwtiLjX cm1w== X-Gm-Message-State: ALoCoQmPT4ghi7Ck1iJpZR+lm4QWd/iz8jhSOnpBSAERZjKS3rMjxtoHCyoePWBwFvyWYRaf9q1V X-Received: by 10.194.240.164 with SMTP id wb4mr7950229wjc.1.1431362586263; Mon, 11 May 2015 09:43:06 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.196 with SMTP id a4ls691655lak.30.gmail; Mon, 11 May 2015 09:43:05 -0700 (PDT) X-Received: by 10.112.204.72 with SMTP id kw8mr8757638lbc.88.1431362585959; Mon, 11 May 2015 09:43:05 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id ei7si8629082lad.156.2015.05.11.09.43.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 May 2015 09:43:05 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbbzk7 with SMTP id zk7so98237064lbb.0 for ; Mon, 11 May 2015 09:43:05 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr8562903lbc.41.1431362585874; Mon, 11 May 2015 09:43:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp1607760lbb; Mon, 11 May 2015 09:43:05 -0700 (PDT) X-Received: by 10.140.19.169 with SMTP id 38mr14345387qgh.75.1431362584649; Mon, 11 May 2015 09:43:04 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f126si13508199qhc.19.2015.05.11.09.43.03; Mon, 11 May 2015 09:43:04 -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; Received: by lists.linaro.org (Postfix, from userid 109) id A0EF261D83; Mon, 11 May 2015 16:43:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A978F61D86; Mon, 11 May 2015 16:41:52 +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 BF70C61D76; Mon, 11 May 2015 16:41:38 +0000 (UTC) Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by lists.linaro.org (Postfix) with ESMTPS id 5E7E161D71 for ; Mon, 11 May 2015 16:40:34 +0000 (UTC) Received: by wizk4 with SMTP id k4so113163689wiz.1 for ; Mon, 11 May 2015 09:40:33 -0700 (PDT) X-Received: by 10.180.223.100 with SMTP id qt4mr21799976wic.1.1431362433640; Mon, 11 May 2015 09:40:33 -0700 (PDT) Received: from localhost.localdomain ([90.152.119.35]) by mx.google.com with ESMTPSA id jq3sm23621168wjc.22.2015.05.11.09.40.32 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 May 2015 09:40:33 -0700 (PDT) From: Zoltan Kiss To: lng-odp@lists.linaro.org Date: Mon, 11 May 2015 17:40:08 +0100 Message-Id: <1431362411-8686-4-git-send-email-zoltan.kiss@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1431362411-8686-1-git-send-email-zoltan.kiss@linaro.org> References: <1431362411-8686-1-git-send-email-zoltan.kiss@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH 3/6] dpdk: don't clone DPDK repo if directory exist X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: zoltan.kiss@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Also, omit the dpdk subdirectory from the path, and clean up the repo in any case. Signed-off-by: Zoltan Kiss --- helper/platform/dpdk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/helper/platform/dpdk b/helper/platform/dpdk index 7d27628..1b99a93 100644 --- a/helper/platform/dpdk +++ b/helper/platform/dpdk @@ -13,17 +13,18 @@ dpdk_usage(){ dpdk_prepare(){ export DPDK_DIR=$ROOT_DIR_DPDK/dpdk/build - export EXTRA_FLAGS="${EXTRA_FLAGS} --with-sdk-install-path=${ROOT_DIR_DPDK}/dpdk/x86_64-native-linuxapp-gcc" + export EXTRA_FLAGS="${EXTRA_FLAGS} --with-sdk-install-path=${ROOT_DIR_DPDK}/x86_64-native-linuxapp-gcc" export GIT_ODP="${GIT_ODP:-git://git.linaro.org/lng/odp-dpdk.git}" } dpdk_get(){ - mkdir $ROOT_DIR_DPDK + if [ ! -d "$ROOT_DIR_DPDK" ]; then + #get DPDK - we need a specific version + git clone ${GIT_DPDK} $ROOT_DIR_DPDK + fi cd $ROOT_DIR_DPDK - #get DPDK - we need a specific version - git clone ${GIT_DPDK} - cd dpdk + git clean -xfd git checkout tags/v1.7.1 #apply patch depending on cleaned up version string to fix later builds