configure: Fix DPDK version lookup in case submodule is in use

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I6184557bfd8ca24168324f874a032badd4f51477
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9558
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
This commit is contained in:
Michal Berger 2021-09-21 19:08:31 +02:00 committed by Tomasz Zawadzki
parent 0d90cda0be
commit c2de56b0a1

23
configure vendored
View File

@ -753,16 +753,21 @@ if [[ "${CONFIG[REDUCE]}" = "y" ]]; then
fi fi
else else
# Check DPDK version to determine if mlx5_pci driver is supported # Check DPDK version to determine if mlx5_pci driver is supported
if [ ! -f "${CONFIG[DPDK_DIR]}"/../VERSION ]; then dpdk_ver=""
echo "Can get DPDK version, so disabling DPDK mlx5_pci compress PMD" if [[ "${CONFIG[DPDK_DIR]}" == "$rootdir/dpdk/build" ]]; then
CONFIG[REDUCE_MLX5]="n" # DPDK_DIR points at our submodule so ./build may not exist yet. Use
# absolute path to lookup the version.
dpdk_ver=$(< "$rootdir/dpdk/VERSION")
elif [[ -f "${CONFIG[DPDK_DIR]}"/../VERSION ]]; then
dpdk_ver=$(< "${CONFIG[DPDK_DIR]}"/../VERSION)
else else
# mlx5_pci is supported by DPDK >- 21.02.0 echo "Cannot get DPDK version, so disabling DPDK mlx5_pci compress PMD"
dpdk_ver=$(cat "${CONFIG[DPDK_DIR]}"/../VERSION) CONFIG[REDUCE_MLX5]="n"
if lt "$dpdk_ver" 21.02.0; then fi
echo "DPDK version ${dpdk_ver} doesn't support mlx5_pci compress PMD" # mlx5_pci is supported by DPDK >- 21.02.0
CONFIG[REDUCE_MLX5]="n" if [[ -n $dpdk_ver ]] && lt "$dpdk_ver" 21.02.0; then
fi echo "DPDK version ${dpdk_ver} doesn't support mlx5_pci compress PMD"
CONFIG[REDUCE_MLX5]="n"
fi fi
fi fi
fi fi