From patchwork Mon Aug 3 12:52:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 51862 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 5A79B228F2 for ; Mon, 3 Aug 2015 12:52:42 +0000 (UTC) Received: by lbcjf8 with SMTP id jf8sf43882426lbc.0 for ; Mon, 03 Aug 2015 05:52:41 -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:mime-version :in-reply-to:references:date:message-id:from:to:cc:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:content-type:content-transfer-encoding :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=6cAScNITymMPvBzLvoxfaVIDxxuRs8ZaJzRIcsbXAEk=; b=NU6aHsz/4YBOabpZTAIWFaw1Igcfabjcl6Jr/XhxUOZ7H7MksFIdKQGDQ2HEJZ+Nmh tbT6nUXkqXJI16xlymEuQAoQLKDrb70dRaj00sL9dFCI0ZcYNY8jnzTpmQKhtuPFuoIV lNdBk2K6hGSnnLTslmyjp+6vKBcvXPcR4hKQNa+ZSKCXhmz5RtT8IkQwt91auM7cLAis 9uDwGskgU1DvCPE3KC5HakBTln9oAQj8+ArM8U5PUdE6WcLz6SNdcnwZFa4OBQt50sJ6 meKJS+iR19gG1N5enCxjvKwjieQjT+lOSpg37wN5ZJOSX8wCS1FYtYoBJw1m8sQsiDVJ ExRQ== X-Gm-Message-State: ALoCoQk//w0PJoOIrYSFPXa8YnfdcPSYzHIfkytwU1j/16MwBfQoumtDNAauvRA+T5LO026kcFGe X-Received: by 10.180.35.162 with SMTP id i2mr5815477wij.6.1438606361256; Mon, 03 Aug 2015 05:52:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.7 with SMTP id u7ls493546laj.105.gmail; Mon, 03 Aug 2015 05:52:41 -0700 (PDT) X-Received: by 10.112.64.172 with SMTP id p12mr12074312lbs.38.1438606361090; Mon, 03 Aug 2015 05:52:41 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id ax10si11895883lbc.94.2015.08.03.05.52.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 05:52:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labgo9 with SMTP id go9so26956931lab.3 for ; Mon, 03 Aug 2015 05:52:41 -0700 (PDT) X-Received: by 10.153.7.66 with SMTP id da2mr2847843lad.117.1438606360974; Mon, 03 Aug 2015 05:52:40 -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.7.198 with SMTP id l6csp1853767lba; Mon, 3 Aug 2015 05:52:39 -0700 (PDT) X-Received: by 10.140.34.135 with SMTP id l7mr23952095qgl.79.1438606359457; Mon, 03 Aug 2015 05:52:39 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z14si16823663qhd.23.2015.08.03.05.52.38; Mon, 03 Aug 2015 05:52:39 -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 5F14C61C6F; Mon, 3 Aug 2015 12:52:38 +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 D15FF61C65; Mon, 3 Aug 2015 12:52:33 +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 1777C61C66; Mon, 3 Aug 2015 12:52:32 +0000 (UTC) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by lists.linaro.org (Postfix) with ESMTPS id CCFCC61B7B for ; Mon, 3 Aug 2015 12:52:30 +0000 (UTC) Received: by wicgj17 with SMTP id gj17so104020798wic.1 for ; Mon, 03 Aug 2015 05:52:30 -0700 (PDT) MIME-Version: 1.0 X-Received: by 10.194.24.196 with SMTP id w4mr33273682wjf.137.1438606349718; Mon, 03 Aug 2015 05:52:29 -0700 (PDT) Received: by 10.27.103.20 with HTTP; Mon, 3 Aug 2015 05:52:29 -0700 (PDT) In-Reply-To: <1438601749-5557-1-git-send-email-maxim.uvarov@linaro.org> References: <1438601749-5557-1-git-send-email-maxim.uvarov@linaro.org> Date: Mon, 3 Aug 2015 14:52:29 +0200 Message-ID: From: Anders Roxell To: Maxim Uvarov X-Topics: patch Cc: LNG ODP Mailman List Subject: Re: [lng-odp] [PATCH] linux-generic: move git_hash.sh under linux-generic directory 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@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.215.49 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 On 3 August 2015 at 13:35, Maxim Uvarov wrote: > git_hash.sh is used to generate version string. Each platform > should have it's own version of that script. I don't think we need to move the files isn't it enough to just do: and then just export repo from the platform//Makefile.am Cheers, Anders > > Signed-off-by: Maxim Uvarov > --- > configure.ac | 2 +- > platform/Makefile.inc | 2 +- > {scripts => platform/linux-generic/scripts}/Makefile.am | 0 > {scripts => platform/linux-generic/scripts}/git_hash.sh | 0 > 4 files changed, 2 insertions(+), 2 deletions(-) > rename {scripts => platform/linux-generic/scripts}/Makefile.am (100%) > rename {scripts => platform/linux-generic/scripts}/git_hash.sh (100%) > > diff --git a/configure.ac b/configure.ac > index 24a3fa1..8b535be 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -300,7 +300,7 @@ AC_CONFIG_FILES([Makefile > pkgconfig/libodphelper.pc > platform/linux-generic/Makefile > platform/linux-generic/test/pktio/Makefile > - scripts/Makefile > + platform/linux-generic/scripts/Makefile > test/Makefile > test/api_test/Makefile > test/performance/Makefile > diff --git a/platform/Makefile.inc b/platform/Makefile.inc > index f64e37c..f26a8c5 100644 > --- a/platform/Makefile.inc > +++ b/platform/Makefile.inc > @@ -12,6 +12,6 @@ lib_LTLIBRARIES = $(LIB)/libodp.la > > AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' > > -GIT_DESC = `$(top_srcdir)/scripts/git_hash.sh` > +GIT_DESC = `$(top_srcdir)/platform/linux-generic/scripts/git_hash.sh` > AM_CFLAGS += "-DGIT_HASH=$(GIT_DESC)" > AM_CFLAGS += -DPLATFORM=${with_platform} > diff --git a/scripts/Makefile.am b/platform/linux-generic/scripts/Makefile.am > similarity index 100% > rename from scripts/Makefile.am > rename to platform/linux-generic/scripts/Makefile.am > diff --git a/scripts/git_hash.sh b/platform/linux-generic/scripts/git_hash.sh > similarity index 100% > rename from scripts/git_hash.sh > rename to platform/linux-generic/scripts/git_hash.sh > -- > 1.9.1 > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > https://lists.linaro.org/mailman/listinfo/lng-odp diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh index c9f1faf..1b55ddb 100755 --- a/scripts/git_hash.sh +++ b/scripts/git_hash.sh @@ -1,6 +1,6 @@ #!/bin/bash -repo=https://git.linaro.org/lng/odp.git +repo=${repo:-https://git.linaro.org/lng/odp.git} hash=$(git describe | tr -d "\n") if git diff-index --name-only HEAD &>/dev/null ; then dirty=-dirty