MFC r277675,r277726,r278070:

r277675:

  Add MK_ISCSI knob for building the iscsi initiator, iscsi daemon, kernel
  modules, etc

  Sponsored by: EMC / Isilon Storage Division

r277726:

  Build sbin/iscontrol again if MK_ISCSI != no

  Pointyhat to: me

r278070:

  Remove duplicate MK_ISCSI block and sort the conditional blocks so this error
  won't crop up again in the future

  Reported by: gjb

9 files changed, 52 insertions, 14 deletions

diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index d464a31..0db93bc 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -63,8 +63,6 @@ FILES=	DAEMON \
 	ipropd_slave \
 	ipsec \
 	${_ipxrouted} \
-	iscsictl \
-	iscsid \
 	${_kadmind} \
 	${_kdc} \
 	keyserv \
@@ -188,6 +186,11 @@ FILES+=		bsnmpd
 _ipxrouted=	ipxrouted
 .endif
 
+.if ${MK_ISCSI} != "no"
+FILES+=		iscsictl
+FILES+=		iscsid
+.endif
+
 .if ${MK_JAIL} != "no"
 FILES+=		jail
 .endif
diff --git a/sbin/Makefile b/sbin/Makefile
index cad3219..f28d311 100644
--- a/sbin/Makefile
+++ b/sbin/Makefile
@@ -35,7 +35,6 @@ SUBDIR=adjkerntz \
 	hastd \
 	ifconfig \
 	init \
-	iscontrol \
 	kldconfig \
 	kldload \
 	kldstat \
@@ -82,6 +81,11 @@ SUBDIR+=	atm
 SUBDIR+=	devd
 .endif
 
+.if ${MK_INET6} != "no"
+SUBDIR+=	ping6
+SUBDIR+=	rtsol
+.endif
+	
 .if ${MK_IPFILTER} != "no"
 SUBDIR+=	ipf
 .endif
@@ -91,6 +95,10 @@ SUBDIR+=	ipfw
 SUBDIR+=	natd
 .endif
 
+.if ${MK_ISCSI} != "no"
+SUBDIR+=	iscontrol
+.endif
+
 .if ${MK_NAND} != "no"
 SUBDIR+=	nandfs
 SUBDIR+=	newfs_nandfs
@@ -101,11 +109,6 @@ SUBDIR+=	pfctl
 SUBDIR+=	pflogd
 .endif
 
-.if ${MK_INET6} != "no"
-SUBDIR+=	ping6
-SUBDIR+=	rtsol
-.endif
-
 .if ${MK_QUOTAS} != "no"
 SUBDIR+=	quotacheck
 .endif
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 9621a71..651172b 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -208,8 +208,6 @@ MAN=	aac.4 \
 	ipw.4 \
 	ipwfw.4 \
 	isci.4 \
-	iscsi.4 \
-	iscsi_initiator.4 \
 	isp.4 \
 	ispfw.4 \
 	iwi.4 \
@@ -861,6 +859,12 @@ _nvram2env.4=	nvram2env.4
 SUBDIR=	man4.${MACHINE_CPUARCH}
 .endif
 
+.if ${MK_ISCSI} != "no"
+MAN+=		iscsi.4
+MAN+=		iscsi_initiator.4
+
+.endif
+
 .if ${MK_TESTS} != "no"
 ATF=            ${.CURDIR}/../../../contrib/atf
 .PATH:          ${ATF}/doc
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index e55057e..58b1044 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \
     IPFILTER \
     IPFW \
     IPX \
+    ISCSI \
     JAIL \
     KDUMP \
     KERBEROS \
diff --git a/sys/modules/Makefile b/sys/modules/Makefile
index 3c65f42..0946897 100644
--- a/sys/modules/Makefile
+++ b/sys/modules/Makefile
@@ -166,8 +166,6 @@ SUBDIR=	\
 	${_ipw} \
 	${_ipwfw} \
 	${_isci} \
-	iscsi \
-	iscsi_initiator \
 	isp \
 	${_ispfw} \
 	${_iwi} \
@@ -435,6 +433,11 @@ _ipdivert=	ipdivert
 _ipfw=		ipfw
 .endif
 
+.if ${MK_ISCSI} != "no" || defined(ALL_MODULES)
+SUBDIR+=	iscsi
+SUBDIR+=	iscsi_initiator
+.endif
+
 .if ${MK_NAND} != "no" || defined(ALL_MODULES)
 _nandfs=	nandfs
 _nandsim=	nandsim
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 2cc23cb..307c427 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -2167,6 +2167,20 @@ OLD_FILES+=usr/share/man/man3/ipx_ntoa.3.gz
 OLD_FILES+=usr/share/man/man8/IPXrouted.8.gz
 .endif
 
+.if ${MK_ISCSI} == no
+OLD_FILES+=etc/rc.d/iscsictl
+OLD_FILES+=etc/rc.d/iscsid
+OLD_FILES+=sbin/iscontrol
+OLD_FILES+=usr/bin/iscsictl
+OLD_FILES+=usr/sbin/iscsid
+OLD_FILES+=usr/share/man/man4/iscsi.4.gz
+OLD_FILES+=usr/share/man/man4/iscsi_initiator.4.gz
+OLD_FILES+=usr/share/man/man5/iscsi.conf.5.gz
+OLD_FILES+=usr/share/man/man8/iscontrol.8.gz
+OLD_FILES+=usr/share/man/man8/iscsictl.8.gz
+OLD_FILES+=usr/share/man/man8/iscsid.8.gz
+.endif
+
 .if ${MK_JAIL} == no
 OLD_FILES+=etc/rc.d/jail
 OLD_FILES+=usr/sbin/jail
diff --git a/tools/build/options/WITHOUT_ISCSI b/tools/build/options/WITHOUT_ISCSI
new file mode 100644
index 0000000..83f3d74
--- /dev/null
+++ b/tools/build/options/WITHOUT_ISCSI
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr iscid 8
+and related utilities.
diff --git a/usr.bin/Makefile b/usr.bin/Makefile
index 224f3e7..3ac348c 100644
--- a/usr.bin/Makefile
+++ b/usr.bin/Makefile
@@ -66,7 +66,6 @@ SUBDIR=	alias \
 	id \
 	ipcrm \
 	ipcs \
-	iscsictl \
 	join \
 	jot \
 	${_kdump} \
@@ -253,6 +252,10 @@ _mkcsmapper=	mkcsmapper
 _mkesdb=	mkesdb
 .endif
 
+.if ${MK_ISCSI} != "no"
+SUBDIR+=	iscsictl
+.endif
+
 .if ${MK_KDUMP} != "no"
 SUBDIR+=        kdump
 SUBDIR+=        truss
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index 3299955..27f63a1 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -39,7 +39,6 @@ SUBDIR=	adduser \
 	ifmcstat \
 	inetd \
 	iostat \
-	iscsid \
 	kldxref \
 	mailwrapper \
 	makefs \
@@ -183,6 +182,10 @@ SUBDIR+=	ipfwpcap
 SUBDIR+=	IPXrouted
 .endif
 
+.if ${MK_ISCSI} != "no"
+SUBDIR+=	iscsid
+.endif
+
 .if ${MK_JAIL} != "no"
 SUBDIR+=	jail
 SUBDIR+=	jexec