Integrate nvmecontrol(8) into the amd64 and i386 builds.

This includes adding NVMe header files to /usr/include/dev/nvme. Sponsored by: Intel
pooya · Sep 17, 2012 · 35d5f1b · 35d5f1b
1 parent 780e343
commit 35d5f1b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
@@ -126,6 +126,8 @@
         ..
         nand
         ..
+        nvme
+        ..
         ofw
         ..
         pbio

diff --git a/include/Makefile b/include/Makefile
@@ -40,8 +40,8 @@ LDIRS=	bsm cam geom net net80211 netatalk netgraph netinet netinet6 \
 
 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 \

diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64
@@ -2,3 +2,4 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
diff --git a/sbin/Makefile.i386 b/sbin/Makefile.i386
@@ -2,4 +2,5 @@
 
 SUBDIR += bsdlabel
 SUBDIR += fdisk
+SUBDIR += nvmecontrol
 SUBDIR += sconfig
-Original file line number
+Diff line change
@@ Expand Up / @@ -126,6 +126,8 @@ @@
             ..
             nand
             ..
+            nvme
+            ..
             ofw
             ..
             pbio
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@

		SUBDIR += bsdlabel
		SUBDIR += fdisk
		SUBDIR += nvmecontrol