From owner-svn-src-head@FreeBSD.ORG Mon Sep 17 21:41:39 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E28D106564A; Mon, 17 Sep 2012 21:41:39 +0000 (UTC) (envelope-from jimharris@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0EDA68FC15; Mon, 17 Sep 2012 21:41:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8HLfc2o091252; Mon, 17 Sep 2012 21:41:38 GMT (envelope-from jimharris@svn.freebsd.org) Received: (from jimharris@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HLfc3R091247; Mon, 17 Sep 2012 21:41:38 GMT (envelope-from jimharris@svn.freebsd.org) Message-Id: <201209172141.q8HLfc3R091247@svn.freebsd.org> From: Jim Harris Date: Mon, 17 Sep 2012 21:41:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r240621 - in head: etc/mtree include sbin X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Sep 2012 21:41:39 -0000 Author: jimharris Date: Mon Sep 17 21:41:38 2012 New Revision: 240621 URL: http://svn.freebsd.org/changeset/base/240621 Log: Integrate nvmecontrol(8) into the amd64 and i386 builds. This includes adding NVMe header files to /usr/include/dev/nvme. Sponsored by: Intel Modified: head/etc/mtree/BSD.include.dist head/include/Makefile head/sbin/Makefile.amd64 head/sbin/Makefile.i386 Modified: head/etc/mtree/BSD.include.dist ============================================================================== --- head/etc/mtree/BSD.include.dist Mon Sep 17 21:26:55 2012 (r240620) +++ head/etc/mtree/BSD.include.dist Mon Sep 17 21:41:38 2012 (r240621) @@ -126,6 +126,8 @@ .. nand .. + nvme + .. ofw .. pbio Modified: head/include/Makefile ============================================================================== --- head/include/Makefile Mon Sep 17 21:26:55 2012 (r240620) +++ head/include/Makefile Mon Sep 17 21:41:38 2012 (r240621) @@ -40,8 +40,8 @@ LDIRS= bsm cam geom net net80211 netatal LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/an dev/bktr dev/ciss dev/filemon dev/firewire dev/hwpmc \ - dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ - dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ + dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/nvme \ + dev/ofw dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ Modified: head/sbin/Makefile.amd64 ============================================================================== --- head/sbin/Makefile.amd64 Mon Sep 17 21:26:55 2012 (r240620) +++ head/sbin/Makefile.amd64 Mon Sep 17 21:41:38 2012 (r240621) @@ -2,3 +2,4 @@ SUBDIR += bsdlabel SUBDIR += fdisk +SUBDIR += nvmecontrol Modified: head/sbin/Makefile.i386 ============================================================================== --- head/sbin/Makefile.i386 Mon Sep 17 21:26:55 2012 (r240620) +++ head/sbin/Makefile.i386 Mon Sep 17 21:41:38 2012 (r240621) @@ -2,4 +2,5 @@ SUBDIR += bsdlabel SUBDIR += fdisk +SUBDIR += nvmecontrol SUBDIR += sconfig