From 4a0ea4d6981376214ddd08e6e596e6d49c1905ab Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 26 Jan 2015 08:04:38 +0000 Subject: [PATCH] Honor MK_ACPI in etc/devd and etc/rc.d MFC after: 1 week Sponsored by: EMC / Isilon Storage Division --- etc/devd/Makefile | 4 ++++ etc/rc.d/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/etc/devd/Makefile b/etc/devd/Makefile index 27dfb92f1711..a0909af08918 100644 --- a/etc/devd/Makefile +++ b/etc/devd/Makefile @@ -2,12 +2,16 @@ .include +FILES= + .if ${MACHINE} == "powerpc" FILES+= apple.conf .endif .if ${MACHINE} == "amd64" || ${MACHINE} == "i386" +.if ${MK_ACPI} != "no" FILES+= asus.conf +.endif .if ${MK_HYPERV} != "no" FILES+= hyperv.conf .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 2586cbf2d602..237456628917 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -103,7 +103,6 @@ FILES= DAEMON \ pflog \ pfsync \ powerd \ - power_profile \ ppp \ pppoed \ pwcheck \ @@ -155,6 +154,10 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_ACPI} != "no" +FILES+= power_profile +.endif + .if ${MK_AUTOFS} != "no" FILES+= automount FILES+= automountd diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b80ca61abe00..06aae91ca645 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -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