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

MFC r277725:

Browse Source 
r277725:

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

  Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
ngie 2015-02-11 07:12:00 +00:00
parent bf4551aa32
commit e146e39f9f
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

@ -46,7 +46,6 @@ FILES= DAEMON \
geli2 \
gptboot \
gssd \
hastd \
${_hcsecd} \
hostid \
hostid_save \
@ -186,6 +185,10 @@ FILES+= bsnmpd
_ipxrouted= ipxrouted
.endif
.if ${MK_HAST} != "no"
FILES+= hastd
.endif
.if ${MK_ISCSI} != "no"
FILES+= iscsictl
FILES+= iscsid

7
sbin/Makefile
View File

@ -31,8 +31,6 @@ SUBDIR=adjkerntz \
ggate \
growfs \
gvinum \
hastctl \
hastd \
ifconfig \
init \
kldconfig \
@ -81,6 +79,11 @@ SUBDIR+= atm
SUBDIR+= devd
.endif
.if ${MK_HAST} != "no"
SUBDIR+= hastctl
SUBDIR+= hastd
.endif
.if ${MK_INET6} != "no"
SUBDIR+= ping6
SUBDIR+= rtsol

15
share/examples/Makefile
View File

@ -14,7 +14,6 @@ LDIRS= BSD_daemon \
drivers \
etc \
find_interface \
hast \
ibcs2 \
indent \
ipfw \
@ -64,11 +63,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
find_interface/Makefile \
find_interface/README \
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/hello.uu \
indent/indent.pro \
@ -202,6 +196,15 @@ BINDIR= ${SHAREDIR}/examples
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
# source (``symlinks''), or a separate copy (``copies''); (latter useful
# in environments where it's not possible to keep /sys publicly readable)

1
share/mk/bsd.own.mk
View File

@ -288,6 +288,7 @@ __DEFAULT_YES_OPTIONS = \
GPIO \
GPL_DTC \
GROFF \
HAST \
HTML \
ICONV \
INET \

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

@ -1987,6 +1987,20 @@ OLD_FILES+=usr/share/man/man5/qop.5.gz
OLD_FILES+=usr/share/man/man8/gssd.8.gz
.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
OLD_FILES+=usr/bin/hesinfo
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.