From owner-svn-src-stable-10@FreeBSD.ORG  Wed Feb  4 09:33:44 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
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 10E30952;
 Wed,  4 Feb 2015 09:33:44 +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 EFECD6E1;
 Wed,  4 Feb 2015 09:33:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t149XhGr029330;
 Wed, 4 Feb 2015 09:33:43 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t149XhUJ029328;
 Wed, 4 Feb 2015 09:33:43 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201502040933.t149XhUJ029328@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org
 using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 4 Feb 2015 09:33:43 +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: r278191 - in stable/10: 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
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2015 09:33:44 -0000

Author: ngie
Date: Wed Feb  4 09:33:42 2015
New Revision: 278191
URL: https://svnweb.freebsd.org/changeset/base/278191

Log:
  MFC r277733:
  
  r277733:
  
    Honor MK_AMD with etc/rc.d/amd
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/etc/rc.d/Makefile
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/rc.d/Makefile
==============================================================================
--- stable/10/etc/rc.d/Makefile	Wed Feb  4 09:31:10 2015	(r278190)
+++ stable/10/etc/rc.d/Makefile	Wed Feb  4 09:33:42 2015	(r278191)
@@ -11,7 +11,6 @@ FILES=	DAEMON \
 	accounting \
 	addswap \
 	adjkerntz \
-	amd \
 	archdep \
 	atm1 \
 	atm2 \
@@ -164,6 +163,10 @@ FILES=	DAEMON \
 	zfs \
 	zvol
 
+.if ${MK_AMD} != "no"
+FILES+=		amd
+.endif
+
 .if ${MK_APM} != "no"
 FILES+=	apm
 FILES+=	apmd

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:31:10 2015	(r278190)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Wed Feb  4 09:33:42 2015	(r278191)
@@ -26,6 +26,7 @@ OLD_FILES+=usr/share/man/man8/iasl.8.gz
 
 .if ${MK_AMD} == no
 OLD_FILES+=etc/amd.map
+OLD_FILES+=etc/rc.d/amd
 OLD_FILES+=usr/bin/pawd
 OLD_FILES+=usr/sbin/amd
 OLD_FILES+=usr/sbin/amq