Commit 407e88fd authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

lib/mk: update OCF build. 



The OCF build was broken by some of the recent changes
to the Makefiles. This change aims to fix that by separating out the ocf
environment from the ocf bdev.

Change-Id: Id445340033898e9ae70a4bcfc799951110762d55
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465808


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 7e1881ce

autobuild.sh

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ if [ "$SPDK_TEST_OCF" -eq 1 ]; then 
	# So we precompile OCF now for further use as standalone static library

	./configure $(echo $config_params | sed 's/--enable-coverage//g')

	$MAKE $MAKEFLAGS include/spdk/config.h

	CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C module/bdev/ocf/env exportlib O=$rootdir/build/ocf.a

	CC=gcc CCAR=ar $MAKE $MAKEFLAGS -C lib/env_ocf exportlib O=$rootdir/build/ocf.a

	# Set config to use precompiled library

	config_params="$config_params --with-ocf=/$rootdir/build/ocf.a"

fi

lib/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ ifeq ($(OS),Linux) 
DIRS-y += nbd ftl

endif



ifeq ($(CONFIG_OCF), y)

DIRS-y += env_ocf

endif



DIRS-$(CONFIG_VHOST) += vhost

DIRS-$(CONFIG_VIRTIO) += virtio

DIRS-$(CONFIG_REDUCE) += reduce

module/bdev/ocf/env/Makefile→lib/env_ocf/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
# Else if SPDK is configured with OCF precompiled library

# we just use it as SPDK lib by copying it to /build/lib/



SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)

SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

OCFDIR=$(CONFIG_OCF_DIR)



include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
@@ -76,17 +76,17 @@ all: ocf_inc ocf_src 
	$(Q)$(MAKE) $(LIB)



ocf_inc:

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" --quiet

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" inc O="$(SPDK_ROOT_DIR)/lib/env_ocf/" ENV= --quiet



ocf_src: ocf_inc

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" CMD=cp --quiet

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" src O="$(SPDK_ROOT_DIR)/lib/env_ocf/" CMD=cp ENV= --quiet



ocf_distclean:

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" distclean O="$(SPDK_ROOT_DIR)/module/bdev/ocf/env/" --quiet

	$(Q)$(MAKE) -C "$(CONFIG_OCF_PATH)" distclean O="$(SPDK_ROOT_DIR)/lib/env_ocf/" ENV= --quiet



clean: ocf_distclean

	$(Q)rm -rf	"$(SPDK_ROOT_DIR)/module/bdev/ocf/env/include" \

				"$(SPDK_ROOT_DIR)/module/bdev/ocf/env/src" \

	$(Q)rm -rf	"$(SPDK_ROOT_DIR)/lib/env_ocf/include" \

				"$(SPDK_ROOT_DIR)/lib/env_ocf/src" \

				$(LIB) $(OBJS);



$(LIB): $(OBJS)