Author: ngie
Date: Wed Feb 4 19:40:30 2015
New Revision: 278219
URL: https://svnweb.freebsd.org/changeset/base/278219
Log:
MFC r277732,r277733:
r277732:
Honor MK_API in etc/rc.d
Sponsored by: EMC / Isilon Storage Division
r277733:
Honor MK_AMD with etc/rc.d/amd
Sponsored by: EMC / Isilon Storage Division
Modified:
stable/9/etc/rc.d/Makefile
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/tools/ (props changed)
stable/9/tools/build/ (props changed)
Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile Wed Feb 4 18:58:09 2015 (r278218)
+++ stable/9/etc/rc.d/Makefile Wed Feb 4 19:40:30 2015 (r278219)
@@ -11,9 +11,6 @@ FILES= DAEMON \
accounting \
addswap \
adjkerntz \
- amd \
- apm \
- apmd \
archdep \
atm1 \
atm2 \
@@ -155,6 +152,15 @@ FILES= DAEMON \
zfs \
zvol
+.if ${MK_AMD} != "no"
+FILES+= amd
+.endif
+
+.if ${MK_APM} != "no"
+FILES+= apm
+FILES+= apmd
+.endif
+
.if ${MK_BSNMP} != "no"
FILES+= bsnmpd
.endif
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 18:58:09
2015 (r278218)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 4 19:40:30
2015 (r278219)
@@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
.if ${MK_AMD} == no
OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
OLD_FILES+=usr/bin/pawd
OLD_FILES+=usr/sbin/amd
OLD_FILES+=usr/sbin/amq
@@ -48,6 +49,8 @@ OLD_FILES+=usr/share/man/man8/wire-test.
.endif
.if ${MK_APM} == no
+OLD_FILES+=etc/rc.d/apm
+OLD_FILES+=etc/rc.d/apmd
OLD_FILES+=etc/apmd.conf
OLD_FILES+=usr/sbin/apm
OLD_FILES+=usr/share/examples/etc/apmd.conf
_______________________________________________
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"
