From owner-svn-src-all@freebsd.org Sat Jul 21 17:13:40 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF6661050F44; Sat, 21 Jul 2018 17:13:40 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 60F5F7086C; Sat, 21 Jul 2018 17:13:40 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 41FCD21E10; Sat, 21 Jul 2018 17:13:40 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6LHDeNu026924; Sat, 21 Jul 2018 17:13:40 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6LHDd3A026921; Sat, 21 Jul 2018 17:13:39 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201807211713.w6LHDd3A026921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Sat, 21 Jul 2018 17:13:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336581 - in head: . etc etc/rc.d X-SVN-Group: head X-SVN-Commit-Author: brd X-SVN-Commit-Paths: in head: . etc etc/rc.d X-SVN-Commit-Revision: 336581 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Jul 2018 17:13:40 -0000 Author: brd Date: Sat Jul 21 17:13:39 2018 New Revision: 336581 URL: https://svnweb.freebsd.org/changeset/base/336581 Log: Revert r336572 and wrap them in machine checks so they are only installed on i386. Approved by: allanjude (mentor), imp Differential Revision: https://reviews.freebsd.org/D16380 Modified: head/ObsoleteFiles.inc head/etc/Makefile head/etc/rc.d/Makefile Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sat Jul 21 16:34:38 2018 (r336580) +++ head/ObsoleteFiles.inc Sat Jul 21 17:13:39 2018 (r336581) @@ -38,9 +38,6 @@ # xargs -n1 | sort | uniq -d; # done -# 20180721: Purge some old forgotten apmd files -OLD_FILES+=etc/apmd.conf -OLD_FILES+=etc/rc.d/apmd # 20180721: move of libmlx5.so.1 and libibverbs.so.1 OLD_LIBS+=usr/lib/libmlx5.so.1 OLD_LIBS+=usr/lib/libibverbs.so.1 Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Sat Jul 21 16:34:38 2018 (r336580) +++ head/etc/Makefile Sat Jul 21 17:13:39 2018 (r336581) @@ -76,6 +76,12 @@ BSM_ETC_DIR= ${DESTDIR}/etc/security BIN1+= amd.map .endif +.if ${MACHINE} == "i386" +.if ${MK_APM} != "no" +BIN1+= apmd.conf +.endif +.endif + .if ${MK_AUTOFS} != "no" BIN1+= auto_master .endif Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Sat Jul 21 16:34:38 2018 (r336580) +++ head/etc/rc.d/Makefile Sat Jul 21 17:13:39 2018 (r336581) @@ -157,6 +157,9 @@ AMDPACKAGE= amd .if ${MK_APM} != "no" FILESGROUPS+= APM APM+= apm +.if ${MACHINE} == "i386" +APM+= apmd +.endif APMPACKAGE= apm .endif