Author: ngie
Date: Wed Feb 11 07:08:32 2015
New Revision: 278555
URL: https://svnweb.freebsd.org/changeset/base/278555
Log:
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
Added:
stable/10/tools/build/options/WITHOUT_ISCSI
- copied unchanged from r277675, head/tools/build/options/WITHOUT_ISCSI
Modified:
stable/10/etc/rc.d/Makefile
stable/10/sbin/Makefile
stable/10/share/man/man4/Makefile
stable/10/share/mk/bsd.own.mk
stable/10/sys/modules/Makefile
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
stable/10/usr.bin/Makefile
stable/10/usr.sbin/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Wed Feb 11 06:57:20 2015 (r278554)
+++ stable/10/etc/rc.d/Makefile Wed Feb 11 07:08:32 2015 (r278555)
@@ -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
Modified: stable/10/sbin/Makefile
==============================================================================
--- stable/10/sbin/Makefile Wed Feb 11 06:57:20 2015 (r278554)
+++ stable/10/sbin/Makefile Wed Feb 11 07:08:32 2015 (r278555)
@@ -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
Modified: stable/10/share/man/man4/Makefile
==============================================================================
--- stable/10/share/man/man4/Makefile Wed Feb 11 06:57:20 2015
(r278554)
+++ stable/10/share/man/man4/Makefile Wed Feb 11 07:08:32 2015
(r278555)
@@ -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
Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Wed Feb 11 06:57:20 2015
(r278554)
+++ stable/10/share/mk/bsd.own.mk Wed Feb 11 07:08:32 2015
(r278555)
@@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \
IPFILTER \
IPFW \
IPX \
+ ISCSI \
JAIL \
KDUMP \
KERBEROS \
Modified: stable/10/sys/modules/Makefile
==============================================================================
--- stable/10/sys/modules/Makefile Wed Feb 11 06:57:20 2015
(r278554)
+++ stable/10/sys/modules/Makefile Wed Feb 11 07:08:32 2015
(r278555)
@@ -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
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 06:57:20
2015 (r278554)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:08:32
2015 (r278555)
@@ -2167,6 +2167,20 @@ OLD_FILES+=usr/share/man/man3/ipx_ntoa.3
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
Copied: stable/10/tools/build/options/WITHOUT_ISCSI (from r277675,
head/tools/build/options/WITHOUT_ISCSI)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_ISCSI Wed Feb 11 07:08:32 2015
(r278555, copy of r277675, head/tools/build/options/WITHOUT_ISCSI)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr iscid 8
+and related utilities.
Modified: stable/10/usr.bin/Makefile
==============================================================================
--- stable/10/usr.bin/Makefile Wed Feb 11 06:57:20 2015 (r278554)
+++ stable/10/usr.bin/Makefile Wed Feb 11 07:08:32 2015 (r278555)
@@ -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
Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile Wed Feb 11 06:57:20 2015 (r278554)
+++ stable/10/usr.sbin/Makefile Wed Feb 11 07:08:32 2015 (r278555)
@@ -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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
