diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-11 07:08:32 +0000 |
| commit | bf4551aa326eb2d4436b7fc27395c12c5fd7c28b (patch) | |
| tree | 014c298a7b5bf94c53d2954853d7eda012b62a35 /tools | |
| parent | b7391dae4ae82148a179e853c782b7da6f441b70 (diff) | |
| download | FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.zip FreeBSD-src-bf4551aa326eb2d4436b7fc27395c12c5fd7c28b.tar.gz | |
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 14 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_ISCSI | 4 |
2 files changed, 18 insertions, 0 deletions
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. |
