svn commit: r341659 - in head/sbin/nvmecontrol: . modules modules/intel modules/wdc

[Warner Losh]

Author: imp
Date: Thu Dec  6 22:58:55 2018
New Revision: 341659
URL: https://svnweb.freebsd.org/changeset/base/341659

Log:
  Move intel and wdc files to their own modules
  
  Move the intel and wdc vendor specific stuff to their own modules.
  
  Sponsored by: Netflix
  Differential Revision:  https://reviews.freebsd.org/D18460

Added:
  head/sbin/nvmecontrol/modules/
  head/sbin/nvmecontrol/modules/Makefile   (contents, props changed)
  head/sbin/nvmecontrol/modules/Makefile.inc   (contents, props changed)
  head/sbin/nvmecontrol/modules/intel/
  head/sbin/nvmecontrol/modules/intel/Makefile   (contents, props changed)
  head/sbin/nvmecontrol/modules/intel/intel.c   (contents, props changed)
     - copied, changed from r341658, head/sbin/nvmecontrol/intel.c
  head/sbin/nvmecontrol/modules/wdc/
  head/sbin/nvmecontrol/modules/wdc/Makefile   (contents, props changed)
  head/sbin/nvmecontrol/modules/wdc/wdc.c   (contents, props changed)
     - copied, changed from r341658, head/sbin/nvmecontrol/wdc.c
Deleted:
  head/sbin/nvmecontrol/intel.c
  head/sbin/nvmecontrol/wdc.c
Modified:
  head/sbin/nvmecontrol/Makefile

Modified: head/sbin/nvmecontrol/Makefile
==============================================================================
--- head/sbin/nvmecontrol/Makefile	Thu Dec  6 22:58:42 2018	(r341658)
+++ head/sbin/nvmecontrol/Makefile	Thu Dec  6 22:58:55 2018	(r341659)
@@ -4,10 +4,11 @@ PACKAGE=runtime
 PROG=	nvmecontrol
 SRCS=	nvmecontrol.c devlist.c firmware.c format.c identify.c identify_ext.c logpage.c \
 	perftest.c reset.c ns.c nvme_util.c power.c nc_util.c
-SRCS+=	wdc.c intel.c
 MAN=	nvmecontrol.8
 LDFLAGS+= -rdynamic
+SUBDIR=	modules
 
 .PATH:	${SRCTOP}/sys/dev/nvme
 
 .include <bsd.prog.mk>
+.include <bsd.subdir.mk>

Added: head/sbin/nvmecontrol/modules/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/nvmecontrol/modules/Makefile	Thu Dec  6 22:58:55 2018	(r341659)
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+SUBDIR=	intel wdc
+
+.include <bsd.subdir.mk>

Added: head/sbin/nvmecontrol/modules/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/nvmecontrol/modules/Makefile.inc	Thu Dec  6 22:58:55 2018	(r341659)
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+PACKAGE=runtime
+NVMECONTROLDIR=	${SRCTOP}/sbin/nvmecontrol
+
+MK_INSTALLLIB=	no
+MK_PROFILE=	no
+
+CFLAGS+=	-I${NVMECONTROLDIR}
+
+SHLIB_NAME?=	${LIB}.so
+LIBDIR=		/lib/nvmecontrol

Added: head/sbin/nvmecontrol/modules/intel/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/nvmecontrol/modules/intel/Makefile	Thu Dec  6 22:58:55 2018	(r341659)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+LIB=	intel
+SRCS=	intel.c
+
+.include <bsd.lib.mk>

Copied and modified: head/sbin/nvmecontrol/modules/intel/intel.c (from r341658, head/sbin/nvmecontrol/intel.c)
==============================================================================

Added: head/sbin/nvmecontrol/modules/wdc/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sbin/nvmecontrol/modules/wdc/Makefile	Thu Dec  6 22:58:55 2018	(r341659)
@@ -0,0 +1,6 @@
+# $FreeBSD$
+
+LIB=	wdc
+SRCS=	wdc.c
+
+.include <bsd.lib.mk>

Copied and modified: head/sbin/nvmecontrol/modules/wdc/wdc.c (from r341658, head/sbin/nvmecontrol/wdc.c)
==============================================================================