diff options
| author | ngie <ngie@FreeBSD.org> | 2015-02-05 10:36:38 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-02-05 10:36:38 +0000 |
| commit | a5b12ae122064335ed2ce1e7b49139920e54060d (patch) | |
| tree | 42a601be25fdfebf222eb4c8fc531109db09684a | |
| parent | cf206fc8f2fb52ec7b32430b02caeca7cc9d4f22 (diff) | |
| download | FreeBSD-src-a5b12ae122064335ed2ce1e7b49139920e54060d.zip FreeBSD-src-a5b12ae122064335ed2ce1e7b49139920e54060d.tar.gz | |
MFC r277730:
r277730:
Honor MK_ACPI in etc/devd and etc/rc.d
Sponsored by: EMC / Isilon Storage Division
| -rw-r--r-- | etc/devd/Makefile | 6 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 5 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/etc/devd/Makefile b/etc/devd/Makefile index 9afdb47..2ea2085 100644 --- a/etc/devd/Makefile +++ b/etc/devd/Makefile @@ -2,18 +2,20 @@ .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 - .if ${MK_HYPERV} != "no" FILES+= hyperv.conf .endif - +.endif .if ${MK_USB} != "no" FILES+= uath.conf usb.conf .endif diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index f922e97..d464a31 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -109,7 +109,6 @@ FILES= DAEMON \ pfsync \ postrandom \ powerd \ - power_profile \ ppp \ pppoed \ pwcheck \ @@ -161,6 +160,10 @@ FILES= DAEMON \ zfs \ zvol +.if ${MK_ACPI} != "no" +FILES+= power_profile +.endif + .if ${MK_AMD} != "no" FILES+= amd .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index bdbf89e..72acf9c 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 |
