Commit 461cfcec authored by Pawel Wodkowski's avatar Pawel Wodkowski Committed by Jim Harris
Browse files

CONFIG: add missing CONFIG_ options 



Also fix options that doesn't start with CONFIG_ prefix.

Change-Id: I32a24373328bab8f513d56c0c09b5a86589f690c
Signed-off-by: default avatarPawel Wodkowski <pawelx.wodkowski@intel.com>
Reviewed-on: https://review.gerrithub.io/427767


Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 9a943bf8

CONFIG

+9 −3
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ CONFIG_PREFIX?=/usr/local 
CONFIG_DEBUG?=n



# Build with support of backtrace printing in log messages. Requires libunwind.

#CONFIG_LOG_BACKTRACE?=n

CONFIG_LOG_BACKTRACE?=n



# Treat warnings as errors (fail the build on any warning).

CONFIG_WERROR?=n
@@ -69,17 +69,18 @@ CONFIG_ENV?=$(SPDK_ROOT_DIR)/lib/env_dpdk 
# installation.

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 CONFIG_FIO_SOURCE_DIR set to a valid

# fio source code directory.

CONFIG_FIO_PLUGIN?=n



# This directory should contain the source code directory for fio

# which is required for building the SPDK FIO plugin.

FIO_SOURCE_DIR?=/usr/src/fio

CONFIG_FIO_SOURCE_DIR?=/usr/src/fio



# Enable RDMA support for the NVMf target.

# Requires ibverbs development libraries.

CONFIG_RDMA?=n

CONFIG_RDMA_SEND_WITH_INVAL?=n



# Build Ceph RBD support in bdev modules

# Requires librbd development libraries
@@ -93,6 +94,7 @@ CONFIG_VIRTIO?=y 


# Build with PMDK backends

CONFIG_PMDK?=n

CONFIG_PMDK_DIR?=



# Build with VPP

CONFIG_VPP?=n
@@ -105,3 +107,7 @@ CONFIG_CRYPTO?=n 


# Build spdk shared libraries in addition to the static ones.

CONFIG_SHARED?=n



# Build with VTune suport.

CONFIG_VTUNE?=n

CONFIG_VTUNE_DIR?=

configure

+10 −10
Original line number Diff line number Diff line
@@ -220,20 +220,20 @@ for i in "$@"; do 
			;;

		--with-fio=*)

			check_dir "$i"

			FIO_SOURCE_DIR="${i#*=}"

			CONFIG_FIO_SOURCE_DIR="${i#*=}"

			CONFIG_FIO_PLUGIN=y

			;;

		--without-fio)

			FIO_SOURCE_DIR=

			CONFIG_FIO_SOURCE_DIR=

			CONFIG_FIO_PLUGIN=n

			;;

		--with-vtune=*)

			check_dir "$i"

			VTUNE_SOURCE_DIR="${i#*=}"

			CONFIG_VTUNE_DIR="${i#*=}"

			CONFIG_VTUNE=y

			;;

		--without-vtune)

			VTUNE_SOURCE_DIR=

			CONFIG_VTUNE_DIR=

			CONFIG_VTUNE=n

			;;

		--)
@@ -271,14 +271,14 @@ else 
fi



if [ "$CONFIG_FIO_PLUGIN" = "y" ]; then

	if [ -z "$FIO_SOURCE_DIR" ]; then

	if [ -z "$CONFIG_FIO_SOURCE_DIR" ]; then

		echo "When fio is enabled, you must specify the fio directory using --with-fio=path"

		exit 1

	fi

fi



if [ "$CONFIG_VTUNE" = "y" ]; then

	if [ -z "$VTUNE_SOURCE_DIR" ]; then

	if [ -z "$CONFIG_VTUNE_DIR" ]; then

		echo "When VTune is enabled, you must specify the VTune directory using --with-vtune=path"

		exit 1

	fi
@@ -411,8 +411,8 @@ fi 
if [ -n "$CONFIG_FIO_PLUGIN" ]; then

	echo "CONFIG_FIO_PLUGIN?=$CONFIG_FIO_PLUGIN" >> CONFIG.local

fi

if [ -n "$FIO_SOURCE_DIR" ]; then

	echo "FIO_SOURCE_DIR?=$FIO_SOURCE_DIR" >> CONFIG.local

if [ -n "$CONFIG_FIO_SOURCE_DIR" ]; then

	echo "CONFIG_FIO_SOURCE_DIR?=$CONFIG_FIO_SOURCE_DIR" >> CONFIG.local

fi

if [ -n "$CONFIG_RDMA" ]; then

	echo "CONFIG_RDMA?=$CONFIG_RDMA" >> CONFIG.local
@@ -432,8 +432,8 @@ fi 
if [ -n "$CONFIG_VTUNE" ]; then

	echo "CONFIG_VTUNE?=$CONFIG_VTUNE" >> CONFIG.local

fi

if [ -n "$VTUNE_SOURCE_DIR" ]; then

	echo "VTUNE_SOURCE_DIR?=$VTUNE_SOURCE_DIR" >> CONFIG.local

if [ -n "$CONFIG_VTUNE_DIR" ]; then

	echo "CONFIG_VTUNE_DIR?=$CONFIG_VTUNE_DIR" >> CONFIG.local

fi



# Environment variables

examples/bdev/fio_plugin/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 
APP := fio_plugin



C_SRCS = fio_plugin.c

CFLAGS += -I$(FIO_SOURCE_DIR)

CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR)

LDFLAGS += -shared -rdynamic



SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log trace

examples/nvme/fio_plugin/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 


APP := fio_plugin



CFLAGS += -I$(FIO_SOURCE_DIR)

CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR)

LDFLAGS += -shared -rdynamic



include $(SPDK_ROOT_DIR)/mk/nvme.libtest.mk

lib/bdev/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) 
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



ifeq ($(CONFIG_VTUNE),y)

CFLAGS += -I$(VTUNE_SOURCE_DIR)/include -I$(VTUNE_SOURCE_DIR)/sdk/src/ittnotify

CFLAGS += -I$(CONFIG_VTUNE_DIR)/include -I$(CONFIG_VTUNE_DIR)/sdk/src/ittnotify

endif



C_SRCS = bdev.c part.c scsi_nvme.c