diff options
| -rw-r--r-- | etc/rc.d/Makefile | 7 | ||||
| -rw-r--r-- | sbin/Makefile | 5 | ||||
| -rw-r--r-- | share/man/man4/Makefile | 8 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 | ||||
| -rw-r--r-- | sys/conf/kern.opts.mk | 1 | ||||
| -rw-r--r-- | sys/modules/Makefile | 7 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 14 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_ISCSI | 4 | ||||
| -rw-r--r-- | usr.bin/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 5 |
10 files changed, 48 insertions, 9 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 4994e9d..bb10868 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/sbin/Makefile b/sbin/Makefile index 3725270..ae0db29 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -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 diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ffedc0f..5c07303 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index b196e38..fc29ace 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -97,6 +97,7 @@ __DEFAULT_YES_OPTIONS = \ INET6 \ IPFILTER \ IPFW \ + ISCSI \ JAIL \ KDUMP \ KVM \ diff --git a/sys/conf/kern.opts.mk b/sys/conf/kern.opts.mk index 16bb134..63e8510 100644 --- a/sys/conf/kern.opts.mk +++ b/sys/conf/kern.opts.mk @@ -30,6 +30,7 @@ __DEFAULT_YES_OPTIONS = \ INET \ INET6 \ IPFILTER \ + ISCSI \ KERNEL_SYMBOLS \ NETGRAPH \ PF \ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 211c8e7..aedb6d0 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index fe2897e..ceb81c9 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2094,6 +2094,20 @@ OLD_FILES+=usr/share/man/man8/ipfwpcap.8.gz 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 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 7106db7..fb12ef8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -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 diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 09e53ad..e1e20d4 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -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 |
