Commit ff6299f8 authored by Jim Harris's avatar Jim Harris
Browse files

build: remove DPDK_DIR 



This is an artifact from before SPDK had a configure
script or a DPDK submodule.  Make configure the
only supported way for specifying the location of the
DPDK installation to use with SPDK.

Signed-off-by: default avatarJim Harris <james.r.harris@intel.com>
Change-Id: I5c197c46220928bb18b97c8807755967d76ea42c

Reviewed-on: https://review.gerrithub.io/424893


Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
parent 01e7c02e

CHANGELOG.md

+8 −0
Original line number Original line Diff line number Diff line
@@ -50,6 +50,14 @@ Default config file pathnames have been removed from iscsi_tgt, nvmf_tgt 
and vhost.  Config file pathnames may now only be specified using the

and vhost.  Config file pathnames may now only be specified using the

-c command line option.

-c command line option.





Users may no longer set DPDK_DIR in their environment to specify the

location of the DPDK installation used to build SPDK.  Using DPDK_DIR

has not been the documented nor recommended way to specify the DPDK

location for several releases, but removing it ensures no unexpected

surprises for users who may have DPDK_DIR defined for other reasons.

Users should just use the "configure" script to specify the DPDK

location before building SPDK.



## v18.07:

## v18.07:





### bdev

### bdev

CONFIG

+1 −3
Original line number Original line Diff line number Diff line
@@ -66,9 +66,7 @@ CONFIG_TESTS?=y 
CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk

CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk





# This directory should contain 'include' and 'lib' directories for your DPDK

# This directory should contain 'include' and 'lib' directories for your DPDK

# installation. Alternatively you can specify this on the command line

# installation.

# with 'make DPDK_DIR=/path/to/dpdk'. This is only a valid entry

# when using the default SPDK environment library.

CONFIG_DPDK_DIR?=$(SPDK_ROOT_DIR)/dpdk/build

CONFIG_DPDK_DIR?=$(SPDK_ROOT_DIR)/dpdk/build





# Build SPDK FIO plugin. Requires FIO_SOURCE_DIR set to a valid

# Build SPDK FIO plugin. Requires FIO_SOURCE_DIR set to a valid

lib/env_dpdk/env.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,7 @@ 
# ENV_LIBS

# ENV_LIBS

# ENV_LINKER_ARGS

# ENV_LINKER_ARGS





DPDK_DIR ?= $(CONFIG_DPDK_DIR)

DPDK_DIR = $(CONFIG_DPDK_DIR)





export DPDK_ABS_DIR = $(abspath $(DPDK_DIR))

export DPDK_ABS_DIR = $(abspath $(DPDK_DIR))

scripts/genconfig.py

+0 −4
Original line number Original line Diff line number Diff line
@@ -15,10 +15,6 @@ for arg in sys.argv: 
        val = m.group(3).strip()

        val = m.group(3).strip()

        args[var] = val

        args[var] = val





# special case for DPDK_DIR, which is short for CONFIG_DPDK_DIR

if 'DPDK_DIR' in args and 'CONFIG_DPDK_DIR' not in args:

    args['CONFIG_DPDK_DIR'] = args['DPDK_DIR']



defs = {}

defs = {}

for config in ('CONFIG', 'CONFIG.local'):

for config in ('CONFIG', 'CONFIG.local'):

    try:

    try: