Date: Sat, 21 Jul 2018 17:13:39 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> 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 Message-ID: <201807211713.w6LHDd3A026921@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807211713.w6LHDd3A026921>