[dpdk-dev] [pktgen PATCH] Fix dpdk-version.sh on Fedora

[dpdk-dev] [pktgen PATCH] Fix dpdk-version.sh on Fedora

[Timothy Redaelli]

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 <tredaelli@redhat.com>
---
 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
-- 
2.13.3

Re: [dpdk-dev] [pktgen PATCH] Fix dpdk-version.sh on Fedora

[Wiles, Keith]

> On Jul 28, 2017, at 11:08 AM, Timothy Redaelli <tredaelli@redhat.com> wrote:
> 
> 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 <tredaelli@redhat.com>
> ---
> 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}

I applied your patch to my ‘dev’ branch. I had added a file path output as well. I did have to patch your patch to work correctly of non-RTE_INCLUDE usage. It appears the [ -n ${RTE_INCLUDE} ] test had to be converted to a -z as the RTE_INCLUDE path was always executed even if RTE_INCLUDE was not defined.

Please give the new version a try and let me know if it works.

> -
> if [ ! -e ${fpath} ]; then
> 	echo "File not found @ "${fpath}
> 	usage
> -- 
> 2.13.3
> 

Regards,
Keith