From owner-svn-src-stable-10@FreeBSD.ORG Thu Feb 5 10:36:40 2015 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 01578572; Thu, 5 Feb 2015 10:36:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C6AAF613; Thu, 5 Feb 2015 10:36:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Aad8N042431; Thu, 5 Feb 2015 10:36:39 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t15Aad0t042425; Thu, 5 Feb 2015 10:36:39 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502051036.t15Aad0t042425@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Thu, 5 Feb 2015 10:36:39 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 10:36:40 -0000 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 +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