From patchwork Mon Aug 3 11:35:49 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 51860 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 patches.linaro.org (Postfix) with ESMTPS id 237A6229FD for ; Mon, 3 Aug 2015 11:36:19 +0000 (UTC) Received: by wijp15 with SMTP id p15sf12781165wij.3 for ; Mon, 03 Aug 2015 04:36:18 -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: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=roTBmmzODnW6QjB3VJ3XQCvPKBIWyHSTqjQvEO278Ss=; b=WZH/EZ5h5Y7jbEja2suad9UTtjC5IUFibQGCqvAx1wRC5R4BjxA+9zemq1UwtRnV+A WhgrgiV8M+/UQ8XiU/HqA4TBjplcHYLNrdY72hFbBrITqULA9GdxDAs0lgTLl32+fdDS zSvHWgCjxc1x26ecpyaIZxJpiBVGSKx9LZtlR73LpYk9BLv9x7QnO4gO+SyWRd7Mxhtt A984oMuNr1Yh0uQRc/RcYTNYOhpPrfnwK4AHBCSDDtKWfpRt+pBGn1Hs05vM5/HlwmJW aG2aXVWBTGeiLXjxIcidBVE4TnFYp436FQgOJojF7/K2+Cu4W22zWX74Pb0HmCc7xE9N HVrg== X-Gm-Message-State: ALoCoQnbmsn99r0Pn/DXC4iTU0Ab++MvMxwDNYH6BrlZVLQkLG/tM3Hnun88NbPXG3eWjYdmG/mp X-Received: by 10.112.130.200 with SMTP id og8mr5421455lbb.21.1438601778332; Mon, 03 Aug 2015 04:36:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.45.73 with SMTP id k9ls511635lam.66.gmail; Mon, 03 Aug 2015 04:36:18 -0700 (PDT) X-Received: by 10.152.45.9 with SMTP id i9mr16188092lam.105.1438601777977; Mon, 03 Aug 2015 04:36:17 -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 o7si11739107lbw.36.2015.08.03.04.36.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2015 04:36:17 -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 labsr2 with SMTP id sr2so9266510lab.2 for ; Mon, 03 Aug 2015 04:36:17 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr16648329lbb.56.1438601777761; Mon, 03 Aug 2015 04:36:17 -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 l6csp1818318lba; Mon, 3 Aug 2015 04:36:16 -0700 (PDT) X-Received: by 10.107.9.137 with SMTP id 9mr19777997ioj.50.1438601776224; Mon, 03 Aug 2015 04:36:16 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id m9si5649842igx.65.2015.08.03.04.36.14; Mon, 03 Aug 2015 04:36:16 -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 84B7A61D8A; Mon, 3 Aug 2015 11:36:14 +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 85DC261C8C; Mon, 3 Aug 2015 11:36: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 E9E1261C94; Mon, 3 Aug 2015 11:36:00 +0000 (UTC) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by lists.linaro.org (Postfix) with ESMTPS id BAA5761C85 for ; Mon, 3 Aug 2015 11:35:59 +0000 (UTC) Received: by wicmv11 with SMTP id mv11so131739332wic.0 for ; Mon, 03 Aug 2015 04:35:59 -0700 (PDT) X-Received: by 10.180.20.48 with SMTP id k16mr33998929wie.56.1438601759021; Mon, 03 Aug 2015 04:35:59 -0700 (PDT) Received: from localhost.localdomain ([87.120.178.39]) by smtp.gmail.com with ESMTPSA id fo1sm13114462wib.24.2015.08.03.04.35.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 03 Aug 2015 04:35:57 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Mon, 3 Aug 2015 14:35:49 +0300 Message-Id: <1438601749-5557-1-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 X-Topics: patch Subject: [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: , 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: maxim.uvarov@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 git_hash.sh is used to generate version string. Each platform should have it's own version of that script. Signed-off-by: Maxim Uvarov Reviewed-by: Mike Holmes --- 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/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 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}