From c77565ee049e9dd95b8519fb7e07174ef9aa6fd4 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Fri, 16 Aug 2019 10:54:47 -0700 Subject: [PATCH] lib/sock: move subdirs to module/sock Rounding out the module concept of SPDK libraries. Change-Id: I2b316153809ae9f73361648fe505274a59d0bdb3 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/465456 Reviewed-by: Changpeng Liu Reviewed-by: Broadcom SPDK FC-NVMe CI Reviewed-by: Jim Harris Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- lib/sock/Makefile | 3 -- module/Makefile | 2 +- module/sock/Makefile | 45 +++++++++++++++++++++++++++++ {lib => module}/sock/posix/Makefile | 0 {lib => module}/sock/posix/posix.c | 0 {lib => module}/sock/vpp/Makefile | 0 {lib => module}/sock/vpp/vpp.c | 0 7 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 module/sock/Makefile rename {lib => module}/sock/posix/Makefile (100%) rename {lib => module}/sock/posix/posix.c (100%) rename {lib => module}/sock/vpp/Makefile (100%) rename {lib => module}/sock/vpp/vpp.c (100%) diff --git a/lib/sock/Makefile b/lib/sock/Makefile index 8860556d1..7d59a12fb 100644 --- a/lib/sock/Makefile +++ b/lib/sock/Makefile @@ -38,7 +38,4 @@ C_SRCS = sock.c net_framework.c LIBNAME = sock -DIRS-y += posix -DIRS-$(CONFIG_VPP) += vpp - include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/Makefile b/module/Makefile index 5627a1955..1ee05de67 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 event +DIRS-y = bdev event sock .PHONY: all clean $(DIRS-y) diff --git a/module/sock/Makefile b/module/sock/Makefile new file mode 100644 index 000000000..89e2a1f49 --- /dev/null +++ b/module/sock/Makefile @@ -0,0 +1,45 @@ +# +# 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 = posix +DIRS-$(CONFIG_VPP) += vpp + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/lib/sock/posix/Makefile b/module/sock/posix/Makefile similarity index 100% rename from lib/sock/posix/Makefile rename to module/sock/posix/Makefile diff --git a/lib/sock/posix/posix.c b/module/sock/posix/posix.c similarity index 100% rename from lib/sock/posix/posix.c rename to module/sock/posix/posix.c diff --git a/lib/sock/vpp/Makefile b/module/sock/vpp/Makefile similarity index 100% rename from lib/sock/vpp/Makefile rename to module/sock/vpp/Makefile diff --git a/lib/sock/vpp/vpp.c b/module/sock/vpp/vpp.c similarity index 100% rename from lib/sock/vpp/vpp.c rename to module/sock/vpp/vpp.c