From patchwork Fri Jul 28 16:08:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timothy Redaelli X-Patchwork-Id: 27258 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id AECBA7CBA; Fri, 28 Jul 2017 18:09:03 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D281B995A for ; Fri, 28 Jul 2017 18:09:01 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F1820CCB78 for ; Fri, 28 Jul 2017 16:09:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F1820CCB78 Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx10.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=tredaelli@redhat.com Received: from graphite.redhat.com (ovpn-116-250.ams2.redhat.com [10.36.116.250]) by smtp.corp.redhat.com (Postfix) with ESMTP id 63E005D9C1 for ; Fri, 28 Jul 2017 16:09:00 +0000 (UTC) From: Timothy Redaelli To: dev@dpdk.org Date: Fri, 28 Jul 2017 18:08:52 +0200 Message-Id: <4711b98574eee0efd9e6867c4413b82be98c6167.1501258132.git.tredaelli@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Fri, 28 Jul 2017 16:09:01 +0000 (UTC) Subject: [dpdk-dev] [pktgen PATCH] Fix dpdk-version.sh on Fedora X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fedora and RHEL dpdk-devel package installs rte_version.h inside $RTE_INCLUDE (/usr/include/dpdk) instead of $RTE_SDK Signed-off-by: Timothy Redaelli --- tools/dpdk-version.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/dpdk-version.sh b/tools/dpdk-version.sh index 0989aa4..75146cf 100755 --- a/tools/dpdk-version.sh +++ b/tools/dpdk-version.sh @@ -87,15 +87,19 @@ EOM exit 1 } -if [ -z ${RTE_SDK} ] ; then - echo "*** RTE_SDK is not set, using "${PWD} - sdk=${PWD} +if [ -n ${RTE_INCLUDE} ] ; then + fpath=${RTE_INCLUDE}/${fname} else - sdk=${RTE_SDK} + if [ -z ${RTE_SDK} ] ; then + echo "*** RTE_SDK is not set, using "${PWD} + sdk=${PWD} + else + sdk=${RTE_SDK} + fi + + fpath=${sdk}/lib/librte_eal/common/include/${fname} fi -fpath=${sdk}/lib/librte_eal/common/include/${fname} - if [ ! -e ${fpath} ]; then echo "File not found @ "${fpath} usage