From 0fe5d059080c10c27a06e4eed3aa5e5a07329c39 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 16 Aug 2019 11:08:47 -0700 Subject: [PATCH] lib/copy: move ioat subdir to module directory. Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465458 (master) (cherry picked from commit f196669374fcb68ff73fdf9147bacf4adf77f0c2) Change-Id: I29b31344a11efd2430e0f77062fb98fa0ab1c71e Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466979 Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Tested-by: SPDK CI Jenkins --- lib/copy/Makefile | 2 - module/Makefile | 2 +- module/copy/Makefile | 44 +++++++++++++++++++ {lib => module}/copy/ioat/Makefile | 0 {lib => module}/copy/ioat/copy_engine_ioat.c | 0 {lib => module}/copy/ioat/copy_engine_ioat.h | 0 .../copy/ioat/copy_engine_ioat_rpc.c | 0 7 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 module/copy/Makefile rename {lib => module}/copy/ioat/Makefile (100%) rename {lib => module}/copy/ioat/copy_engine_ioat.c (100%) rename {lib => module}/copy/ioat/copy_engine_ioat.h (100%) rename {lib => module}/copy/ioat/copy_engine_ioat_rpc.c (100%) diff --git a/lib/copy/Makefile b/lib/copy/Makefile index 31f983b533..0012bd80d3 100644 --- a/lib/copy/Makefile +++ b/lib/copy/Makefile @@ -37,6 +37,4 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk LIBNAME = copy C_SRCS = copy_engine.c -DIRS-y = ioat - include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/Makefile b/module/Makefile index a028175a3d..5643000689 100644 --- a/module/Makefile +++ b/module/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev blob event sock +DIRS-y = bdev blob copy event sock .PHONY: all clean $(DIRS-y) diff --git a/module/copy/Makefile b/module/copy/Makefile new file mode 100644 index 0000000000..1468d9b103 --- /dev/null +++ b/module/copy/Makefile @@ -0,0 +1,44 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = ioat + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/lib/copy/ioat/Makefile b/module/copy/ioat/Makefile similarity index 100% rename from lib/copy/ioat/Makefile rename to module/copy/ioat/Makefile diff --git a/lib/copy/ioat/copy_engine_ioat.c b/module/copy/ioat/copy_engine_ioat.c similarity index 100% rename from lib/copy/ioat/copy_engine_ioat.c rename to module/copy/ioat/copy_engine_ioat.c diff --git a/lib/copy/ioat/copy_engine_ioat.h b/module/copy/ioat/copy_engine_ioat.h similarity index 100% rename from lib/copy/ioat/copy_engine_ioat.h rename to module/copy/ioat/copy_engine_ioat.h diff --git a/lib/copy/ioat/copy_engine_ioat_rpc.c b/module/copy/ioat/copy_engine_ioat_rpc.c similarity index 100% rename from lib/copy/ioat/copy_engine_ioat_rpc.c rename to module/copy/ioat/copy_engine_ioat_rpc.c