svn commit: r289469 - head/rescue/rescue
Garrett Cooper
ngie at FreeBSD.org
Sat Oct 17 21:11:44 UTC 2015
Author: ngie
Date: Sat Oct 17 21:11:42 2015
New Revision: 289469
URL: https://svnweb.freebsd.org/changeset/base/289469
Log:
Make iscsictl and iscsid build if MK_ISCSI == yes
MFC after: 1 month
X-MFC with: r289452
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile Sat Oct 17 20:38:40 2015 (r289468)
+++ head/rescue/rescue/Makefile Sat Oct 17 21:11:42 2015 (r289469)
@@ -179,7 +179,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRU
#
CRUNCH_SRCDIRS+= usr.bin
-CRUNCH_PROGS_usr.bin= head iscsictl mt nc sed tail tee
+CRUNCH_PROGS_usr.bin= head mt nc sed tail tee
CRUNCH_PROGS_usr.bin+= gzip
CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@@ -214,12 +214,17 @@ CRUNCH_ALIAS_id= groups whoami
#
CRUNCH_SRCDIRS+= usr.sbin
-CRUNCH_PROGS_usr.sbin+= chroot iscsid
+CRUNCH_PROGS_usr.sbin+= chroot
CRUNCH_PROGS_usr.sbin+= chown
CRUNCH_ALIAS_chown= chgrp
##################################################################
CRUNCH_LIBS+= -lm
+.if ${MK_ISCSI} != "no"
+CRUNCH_PROGS_usr.bin+= iscsictl
+CRUNCH_PROGS_usr.sbin+= iscsid
+.endif
+
.include <bsd.crunchgen.mk>
.include <bsd.prog.mk>
More information about the svn-src-all
mailing list