Author: ngie
Date: Wed Feb 11 07:12:00 2015
New Revision: 278556
URL: https://svnweb.freebsd.org/changeset/base/278556
Log:
MFC r277725:
r277725:
Add MK_HAST knob for building and installing hastd(8), et al
Sponsored by: EMC / Isilon Storage Division
Added:
stable/10/tools/build/options/WITHOUT_HAST
- copied unchanged from r277725, head/tools/build/options/WITHOUT_HAST
Modified:
stable/10/etc/rc.d/Makefile
stable/10/sbin/Makefile
stable/10/share/examples/Makefile
stable/10/share/mk/bsd.own.mk
stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile Wed Feb 11 07:08:32 2015 (r278555)
+++ stable/10/etc/rc.d/Makefile Wed Feb 11 07:12:00 2015 (r278556)
@@ -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
Modified: stable/10/sbin/Makefile
==============================================================================
--- stable/10/sbin/Makefile Wed Feb 11 07:08:32 2015 (r278555)
+++ stable/10/sbin/Makefile Wed Feb 11 07:12:00 2015 (r278556)
@@ -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
Modified: stable/10/share/examples/Makefile
==============================================================================
--- stable/10/share/examples/Makefile Wed Feb 11 07:08:32 2015
(r278555)
+++ stable/10/share/examples/Makefile Wed Feb 11 07:12:00 2015
(r278556)
@@ -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)
Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk Wed Feb 11 07:08:32 2015
(r278555)
+++ stable/10/share/mk/bsd.own.mk Wed Feb 11 07:12:00 2015
(r278556)
@@ -288,6 +288,7 @@ __DEFAULT_YES_OPTIONS = \
GPIO \
GPL_DTC \
GROFF \
+ HAST \
HTML \
ICONV \
INET \
Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:08:32
2015 (r278555)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:12:00
2015 (r278556)
@@ -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
Copied: stable/10/tools/build/options/WITHOUT_HAST (from r277725,
head/tools/build/options/WITHOUT_HAST)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_HAST Wed Feb 11 07:12:00 2015
(r278556, copy of r277725, head/tools/build/options/WITHOUT_HAST)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr hastd 8
+and related utilities.
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
