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 /sys/modules/Makefile | |
| 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 'sys/modules/Makefile')
| -rw-r--r-- | sys/modules/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 3c65f42..0946897 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -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 |
