Date: Thu, 5 Feb 2015 10:36:39 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278246 - in stable/10: etc/devd etc/rc.d tools/build/mk Message-ID: <201502051036.t15Aad0t042425@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 5 10:36:38 2015 New Revision: 278246 URL: https://svnweb.freebsd.org/changeset/base/278246 Log: MFC r277730: r277730: Honor MK_ACPI in etc/devd and etc/rc.d Sponsored by: EMC / Isilon Storage Division Modified: stable/10/etc/devd/Makefile stable/10/etc/rc.d/Makefile stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/etc/devd/Makefile ============================================================================== --- stable/10/etc/devd/Makefile Thu Feb 5 10:26:24 2015 (r278245) +++ stable/10/etc/devd/Makefile Thu Feb 5 10:36:38 2015 (r278246) @@ -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 Modified: stable/10/etc/rc.d/Makefile ============================================================================== --- stable/10/etc/rc.d/Makefile Thu Feb 5 10:26:24 2015 (r278245) +++ stable/10/etc/rc.d/Makefile Thu Feb 5 10:36:38 2015 (r278246) @@ -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 Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 10:26:24 2015 (r278245) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Thu Feb 5 10:36:38 2015 (r278246) @@ -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?201502051036.t15Aad0t042425>