summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/devd/Makefile4
-rw-r--r--etc/rc.d/Makefile5
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc2
3 files changed, 10 insertions, 1 deletions
diff --git a/etc/devd/Makefile b/etc/devd/Makefile
index 27dfb92..a0909af 100644
--- a/etc/devd/Makefile
+++ b/etc/devd/Makefile
@@ -2,12 +2,16 @@
.include <src.opts.mk>
+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 2586cbf..2374566 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 b80ca61..06aae91 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
OpenPOWER on IntegriCloud