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

Add MK_HAST knob for building and installing hastd(8), et al

Browse Source 
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-01-26 06:27:07 +00:00
parent 9500dd9f0b
commit 4e39505449
6 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etc/rc.d/Makefile
View File

@ -48,7 +48,6 @@ FILES= DAEMON \
gptboot \ gptboot \
growfs \ growfs \
gssd \ gssd \
hastd \
${_hcsecd} \ ${_hcsecd} \
hostapd \ hostapd \
hostid \ hostid \
@ -178,6 +177,10 @@ _casperd= casperd
FILES+= ccd FILES+= ccd
.endif .endif
.if ${MK_HAST} != "no"
FILES+= hastd
.endif
.if ${MK_ISCSI} != "no" .if ${MK_ISCSI} != "no"
FILES+= iscsictl FILES+= iscsictl
FILES+= iscsid FILES+= iscsid

7
sbin/Makefile
View File

@ -30,8 +30,6 @@ SUBDIR=adjkerntz \
ggate \ ggate \
growfs \ growfs \
gvinum \ gvinum \
hastctl \
hastd \
ifconfig \ ifconfig \
init \ init \
kldconfig \ kldconfig \
@ -88,6 +86,11 @@ SUBDIR+= ccdconfig
SUBDIR+= devd SUBDIR+= devd
.endif .endif
.if ${MK_HAST} != "no"
SUBDIR+= hastctl
SUBDIR+= hastd
.endif
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
SUBDIR+= ipf SUBDIR+= ipf
.endif .endif

15
share/examples/Makefile
View File

@ -14,7 +14,6 @@ LDIRS= BSD_daemon \
drivers \ drivers \
etc \ etc \
find_interface \ find_interface \
hast \
ibcs2 \ ibcs2 \
indent \ indent \
ipfw \ ipfw \
@ -64,11 +63,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
find_interface/Makefile \ find_interface/Makefile \
find_interface/README \ find_interface/README \
find_interface/find_interface.c \ find_interface/find_interface.c \
hast/ucarp.sh \
hast/ucarp_down.sh \
hast/ucarp_up.sh \
hast/vip-down.sh \
hast/vip-up.sh \
ibcs2/README \ ibcs2/README \
ibcs2/hello.uu \ ibcs2/hello.uu \
indent/indent.pro \ indent/indent.pro \
@ -202,6 +196,15 @@ BINDIR= ${SHAREDIR}/examples
NO_OBJ= NO_OBJ=
.if ${MK_HAST} != "no"
LDIRS+= hast
XFILES+= hast/ucarp.sh \
hast/ucarp_down.sh \
hast/ucarp_up.sh \
hast/vip-down.sh \
hast/vip-up.sh
.endif
# Define SHARED to indicate whether you want symbolic links to the system # Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''); (latter useful # source (``symlinks''), or a separate copy (``copies''); (latter useful
# in environments where it's not possible to keep /sys publicly readable) # in environments where it's not possible to keep /sys publicly readable)

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

@ -92,6 +92,7 @@ __DEFAULT_YES_OPTIONS = \
GPIO \ GPIO \
GPL_DTC \ GPL_DTC \
GROFF \ GROFF \
HAST \
HTML \ HTML \
HYPERV \ HYPERV \
ICONV \ ICONV \

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

@ -2144,6 +2144,20 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz
OLD_FILES+=usr/share/man/man8/gssd.8.gz OLD_FILES+=usr/share/man/man8/gssd.8.gz
.endif .endif
.if ${MK_HAST} == no
OLD_FILES+=sbin/hastctl
OLD_FILES+=sbin/hastd
OLD_FILES+=usr/share/examples/hast/ucarp.sh
OLD_FILES+=usr/share/examples/hast/ucarp_down.sh
OLD_FILES+=usr/share/examples/hast/ucarp_up.sh
OLD_FILES+=usr/share/examples/hast/vip-down.sh
OLD_FILES+=usr/share/examples/hast/vip-up.sh
OLD_FILES+=usr/share/man/man5/hast.conf.5.gz
OLD_FILES+=usr/share/man/man8/hastctl.8.gz
OLD_FILES+=usr/share/man/man8/hastd.8.gz
OLD_DIRS+=usr/share/examples/hast
.endif
.if ${MK_HESIOD} == no .if ${MK_HESIOD} == no
OLD_FILES+=usr/bin/hesinfo OLD_FILES+=usr/bin/hesinfo
OLD_FILES+=usr/include/hesiod.h OLD_FILES+=usr/include/hesiod.h

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

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