svn commit: r278247 - in stable/9: etc/devd etc/rc.d tools/build/mk

[Garrett Cooper]

Author: ngie
Date: Thu Feb  5 10:50:51 2015
New Revision: 278247
URL: https://svnweb.freebsd.org/changeset/base/278247

Log:
  MFC r277730:
  
  r277730:
  
    Honor MK_ACPI in etc/devd and etc/rc.d
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/9/etc/devd/Makefile
  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/devd/Makefile
==============================================================================
--- stable/9/etc/devd/Makefile	Thu Feb  5 10:36:38 2015	(r278246)
+++ stable/9/etc/devd/Makefile	Thu Feb  5 10:50:51 2015	(r278247)
@@ -2,13 +2,17 @@
 
 .include <bsd.own.mk>
 
+FILES=
+
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf
 .endif
 
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
+.if ${MK_ACPI} != "no"
 FILES+=	asus.conf
 .endif
+.endif
 
 .if ${MK_USB} != "no"
 FILES+=	uath.conf usb.conf

Modified: stable/9/etc/rc.d/Makefile
==============================================================================
--- stable/9/etc/rc.d/Makefile	Thu Feb  5 10:36:38 2015	(r278246)
+++ stable/9/etc/rc.d/Makefile	Thu Feb  5 10:50:51 2015	(r278247)
@@ -101,7 +101,6 @@ FILES=	DAEMON \
 	pflog \
 	pfsync \
 	powerd \
-	power_profile \
 	ppp \
 	pppoed \
 	pwcheck \
@@ -154,6 +153,10 @@ FILES=	DAEMON \
 FILES+=		amd
 .endif
 
+.if ${MK_ACPI} != "no"
+FILES+=		power_profile
+.endif
+
 .if ${MK_APM} != "no"
 FILES+=	apm
 FILES+=	apmd

Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 10:36:38 2015	(r278246)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc	Thu Feb  5 10:50:51 2015	(r278247)
@@ -14,6 +14,8 @@ OLD_FILES+=usr/share/man/man8/sa.8.gz
 .endif
 
 .if ${MK_ACPI} == no
+OLD_FILES+=etc/devd/asus.conf
+OLD_FILES+=etc/rc.d/power_profile
 OLD_FILES+=usr/sbin/acpiconf
 OLD_FILES+=usr/sbin/acpidb
 OLD_FILES+=usr/sbin/acpidump