From owner-svn-src-all@freebsd.org Thu Dec 6 22:58:58 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4241213174BF; Thu, 6 Dec 2018 22:58:58 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D910F8654D; Thu, 6 Dec 2018 22:58:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9FC62589; Thu, 6 Dec 2018 22:58:57 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wB6Mwvud026418; Thu, 6 Dec 2018 22:58:57 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wB6MwuHi026412; Thu, 6 Dec 2018 22:58:56 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201812062258.wB6MwuHi026412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Thu, 6 Dec 2018 22:58:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r341659 - in head/sbin/nvmecontrol: . modules modules/intel modules/wdc X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sbin/nvmecontrol: . modules modules/intel modules/wdc X-SVN-Commit-Revision: 341659 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D910F8654D X-Spamd-Result: default: False [-1.89 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.87)[-0.865,0]; NEURAL_HAM_SHORT(-0.97)[-0.970,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-0.05)[-0.054,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Dec 2018 22:58:58 -0000 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 +.include 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 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 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 Copied and modified: head/sbin/nvmecontrol/modules/wdc/wdc.c (from r341658, head/sbin/nvmecontrol/wdc.c) ==============================================================================