Date: Sun, 25 Jan 2015 04:20:12 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277675 - in head: etc/rc.d sbin share/man/man4 share/mk sys/conf sys/modules tools/build/mk tools/build/options usr.bin usr.sbin Message-ID: <201501250420.t0P4KCKK006060@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Jan 25 04:20:11 2015 New Revision: 277675 URL: https://svnweb.freebsd.org/changeset/base/277675 Log: Add MK_ISCSI knob for building the iscsi initiator, iscsi daemon, kernel modules, etc MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Added: head/tools/build/options/WITHOUT_ISCSI (contents, props changed) Modified: head/etc/rc.d/Makefile head/sbin/Makefile head/share/man/man4/Makefile head/share/mk/src.opts.mk head/sys/conf/kern.opts.mk head/sys/modules/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/usr.bin/Makefile head/usr.sbin/Makefile Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/etc/rc.d/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -66,8 +66,6 @@ FILES= DAEMON \ ipropd_master \ ipropd_slave \ ipsec \ - iscsictl \ - iscsid \ jail \ ${_kadmind} \ ${_kdc} \ @@ -174,6 +172,11 @@ _ubthidhci= ubthidhci _casperd= casperd .endif +.if ${MK_ISCSI} != "no" +FILES+= iscsictl +FILES+= iscsid +.endif + .if ${MK_NS_CACHING} != "no" _nscd= nscd .endif Modified: head/sbin/Makefile ============================================================================== --- head/sbin/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/sbin/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -35,7 +35,6 @@ SUBDIR=adjkerntz \ hastd \ ifconfig \ init \ - iscontrol \ kldconfig \ kldload \ kldstat \ @@ -109,6 +108,10 @@ SUBDIR+= pflogd SUBDIR+= ping6 SUBDIR+= rtsol .endif + +.if ${MK_ISCSI} != "no" +SUBDIR+= iscontrol +.endif .if ${MK_QUOTAS} != "no" SUBDIR+= quotacheck Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/share/man/man4/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -206,8 +206,6 @@ MAN= aac.4 \ ipw.4 \ ipwfw.4 \ isci.4 \ - iscsi.4 \ - iscsi_initiator.4 \ ismt.4 \ isp.4 \ ispfw.4 \ @@ -860,6 +858,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: head/share/mk/src.opts.mk ============================================================================== --- head/share/mk/src.opts.mk Sun Jan 25 03:08:21 2015 (r277674) +++ head/share/mk/src.opts.mk Sun Jan 25 04:20:11 2015 (r277675) @@ -97,6 +97,7 @@ __DEFAULT_YES_OPTIONS = \ INET6 \ IPFILTER \ IPFW \ + ISCSI \ JAIL \ KDUMP \ KVM \ Modified: head/sys/conf/kern.opts.mk ============================================================================== --- head/sys/conf/kern.opts.mk Sun Jan 25 03:08:21 2015 (r277674) +++ head/sys/conf/kern.opts.mk Sun Jan 25 04:20:11 2015 (r277675) @@ -30,6 +30,7 @@ __DEFAULT_YES_OPTIONS = \ INET \ INET6 \ IPFILTER \ + ISCSI \ KERNEL_SYMBOLS \ NETGRAPH \ PF \ Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/sys/modules/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -169,8 +169,6 @@ SUBDIR= \ ${_ipw} \ ${_ipwfw} \ ${_isci} \ - iscsi \ - iscsi_initiator \ isp \ ${_ispfw} \ ${_iwi} \ @@ -413,6 +411,11 @@ _ipfw= ipfw _ipfilter= ipfilter .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: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 03:08:21 2015 (r277674) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jan 25 04:20:11 2015 (r277675) @@ -2094,6 +2094,20 @@ OLD_FILES+=usr/share/man/man8/ipfwpcap.8 OLD_FILES+=usr/share/man/man8/natd.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+=usr/sbin/jail OLD_FILES+=usr/sbin/jexec Added: head/tools/build/options/WITHOUT_ISCSI ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITHOUT_ISCSI Sun Jan 25 04:20:11 2015 (r277675) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr iscid 8 +and related utilities. Modified: head/usr.bin/Makefile ============================================================================== --- head/usr.bin/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/usr.bin/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -69,7 +69,6 @@ SUBDIR= ${_addr2line} \ id \ ipcrm \ ipcs \ - iscsictl \ join \ jot \ ${_kdump} \ @@ -273,6 +272,10 @@ _mkcsmapper= mkcsmapper _mkesdb= mkesdb .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsictl +.endif + .if ${MK_KDUMP} != "no" SUBDIR+= kdump SUBDIR+= truss Modified: head/usr.sbin/Makefile ============================================================================== --- head/usr.sbin/Makefile Sun Jan 25 03:08:21 2015 (r277674) +++ head/usr.sbin/Makefile Sun Jan 25 04:20:11 2015 (r277675) @@ -38,7 +38,6 @@ SUBDIR= adduser \ ifmcstat \ inetd \ iostat \ - iscsid \ kldxref \ mailwrapper \ makefs \ @@ -178,6 +177,10 @@ SUBDIR+= traceroute6 SUBDIR+= ipfwpcap .endif +.if ${MK_ISCSI} != "no" +SUBDIR+= iscsid +.endif + .if ${MK_JAIL} != "no" SUBDIR+= jail SUBDIR+= jexec
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501250420.t0P4KCKK006060>