diff options
| -rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
| -rw-r--r-- | sbin/Makefile | 7 | ||||
| -rw-r--r-- | share/examples/Makefile | 15 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 14 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_HAST | 4 |
6 files changed, 37 insertions, 9 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 0db93bc..ad3fb66 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -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 diff --git a/sbin/Makefile b/sbin/Makefile index f28d311..74659cc 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -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 diff --git a/share/examples/Makefile b/share/examples/Makefile index 312a17f..a674f72 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -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) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 58b1044..c2265e6 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -288,6 +288,7 @@ __DEFAULT_YES_OPTIONS = \ GPIO \ GPL_DTC \ GROFF \ + HAST \ HTML \ ICONV \ INET \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 307c427..45fcf4f 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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 diff --git a/tools/build/options/WITHOUT_HAST b/tools/build/options/WITHOUT_HAST new file mode 100644 index 0000000..0c31b8c --- /dev/null +++ b/tools/build/options/WITHOUT_HAST @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr hastd 8 +and related utilities. |
