d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
modules, etc

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-01-25 04:20:11 +00:00
parent 60e03a568c
commit b29d6977f3
10 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
etc/rc.d/Makefile
View File

@ -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

5
sbin/Makefile
View File

@ -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

8
share/man/man4/Makefile
View File

@ -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

1
share/mk/src.opts.mk
View File

@ -97,6 +97,7 @@ __DEFAULT_YES_OPTIONS = \
INET6 \
IPFILTER \
IPFW \
ISCSI \
JAIL \
KDUMP \
KVM \

1
sys/conf/kern.opts.mk
View File

@ -30,6 +30,7 @@ __DEFAULT_YES_OPTIONS = \
INET \
INET6 \
IPFILTER \
ISCSI \
KERNEL_SYMBOLS \
NETGRAPH \
PF \

7
sys/modules/Makefile
View File

@ -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

14
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -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

4
tools/build/options/WITHOUT_ISCSI Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build
.Xr iscid 8
and related utilities.

5
usr.bin/Makefile
View File

@ -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

5
usr.sbin/Makefile
View File

@ -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