Author: ngie
Date: Fri Feb 13 21:41:23 2015
New Revision: 278719
URL: https://svnweb.freebsd.org/changeset/base/278719
Log:
MFstable/10 r278556:
r278556:
MFC r277725:
r277725:
Add MK_HAST knob for building and installing hastd(8), et al
Sponsored by: EMC / Isilon Storage Division
Added:
stable/9/tools/build/options/WITHOUT_HAST
- copied unchanged from r278556, stable/10/tools/build/options/WITHOUT_HAST
Modified:
stable/9/etc/rc.d/Makefile
stable/9/sbin/Makefile
stable/9/share/examples/Makefile
stable/9/share/mk/bsd.own.mk
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
stable/9/sbin/ (props changed)
stable/9/share/ (props changed)
stable/9/share/examples/ (props changed)
stable/9/share/mk/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/ (props changed)
stable/9/tools/build/options/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Fri Feb 13 21:36:16 2015 (r278718)
+++ stable/9/etc/rc.d/Makefile Fri Feb 13 21:41:23 2015 (r278719)
@@ -41,7 +41,6 @@ FILES= DAEMON \
geli2 \
gptboot \
gssd \
- hastd \
${_hcsecd} \
hostid \
hostid_save \
@@ -172,6 +171,10 @@ FILES+= bsnmpd
FILES+= ccd
.endif
+.if ${MK_HAST} != "no"
+FILES+= hastd
+.endif
+
.if ${MK_IPX} != "no"
_ipxrouted= ipxrouted
.endif
Modified: stable/9/sbin/Makefile
==============================================================================
--- stable/9/sbin/Makefile Fri Feb 13 21:36:16 2015 (r278718)
+++ stable/9/sbin/Makefile Fri Feb 13 21:41:23 2015 (r278719)
@@ -30,8 +30,6 @@ SUBDIR=adjkerntz \
ggate \
growfs \
gvinum \
- hastctl \
- hastd \
ifconfig \
init \
iscontrol \
@@ -85,6 +83,11 @@ SUBDIR+= ccdconfig
SUBDIR+= devd
.endif
+.if ${MK_HAST} != "no"
+SUBDIR+= hastctl
+SUBDIR+= hastd
+.endif
+
.if ${MK_IPFILTER} != "no"
SUBDIR+= ipf
.endif
Modified: stable/9/share/examples/Makefile
==============================================================================
--- stable/9/share/examples/Makefile Fri Feb 13 21:36:16 2015
(r278718)
+++ stable/9/share/examples/Makefile Fri Feb 13 21:41:23 2015
(r278719)
@@ -14,7 +14,6 @@ LDIRS= BSD_daemon \
drivers \
etc \
find_interface \
- hast \
ibcs2 \
indent \
ipfw \
@@ -69,11 +68,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 \
@@ -205,6 +199,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/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk Fri Feb 13 21:36:16 2015
(r278718)
+++ stable/9/share/mk/bsd.own.mk Fri Feb 13 21:41:23 2015
(r278719)
@@ -374,6 +374,7 @@ __DEFAULT_YES_OPTIONS = \
GPIB \
GPIO \
GROFF \
+ HAST \
HTML \
INET \
INET6 \
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:36:16
2015 (r278718)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Fri Feb 13 21:41:23
2015 (r278719)
@@ -2232,6 +2232,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/9/tools/build/options/WITHOUT_HAST (from r278556,
stable/10/tools/build/options/WITHOUT_HAST)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITHOUT_HAST Fri Feb 13 21:41:23 2015
(r278719, copy of r278556, stable/10/tools/build/options/WITHOUT_HAST)
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Set to not build
+.Xr hastd 8
+and related utilities.
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
