Date: Mon, 26 Jan 2015 08:04:38 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r277730 - in head: etc/devd etc/rc.d tools/build/mk Message-ID: <201501260804.t0Q84cBR096155@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Jan 26 08:04:38 2015 New Revision: 277730 URL: https://svnweb.freebsd.org/changeset/base/277730 Log: Honor MK_ACPI in etc/devd and etc/rc.d MFC after: 1 week Sponsored by: EMC / Isilon Storage Division Modified: head/etc/devd/Makefile head/etc/rc.d/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/etc/devd/Makefile ============================================================================== --- head/etc/devd/Makefile Mon Jan 26 07:24:18 2015 (r277729) +++ head/etc/devd/Makefile Mon Jan 26 08:04:38 2015 (r277730) @@ -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 Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Mon Jan 26 07:24:18 2015 (r277729) +++ head/etc/rc.d/Makefile Mon Jan 26 08:04:38 2015 (r277730) @@ -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 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 07:24:18 2015 (r277729) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 08:04:38 2015 (r277730) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501260804.t0Q84cBR096155>