Date: Fri, 15 Jul 2016 19:58:05 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r302912 - in stable/11/usr.sbin: etcupdate mergemaster Message-ID: <201607151958.u6FJw5lH000786@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Fri Jul 15 19:58:05 2016 New Revision: 302912 URL: https://svnweb.freebsd.org/changeset/base/302912 Log: MFC r302674: META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8) Approved by: re (gjb) Modified: stable/11/usr.sbin/etcupdate/etcupdate.sh stable/11/usr.sbin/mergemaster/mergemaster.sh Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/etcupdate/etcupdate.sh ============================================================================== --- stable/11/usr.sbin/etcupdate/etcupdate.sh Fri Jul 15 19:43:24 2016 (r302911) +++ stable/11/usr.sbin/etcupdate/etcupdate.sh Fri Jul 15 19:58:05 2016 (r302912) @@ -184,7 +184,7 @@ build_tree() { local destdir dir file make - make="make $MAKE_OPTIONS" + make="make $MAKE_OPTIONS -DNO_FILEMON" log "Building tree at $1 with $make" mkdir -p $1/usr/obj >&3 2>&1 Modified: stable/11/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- stable/11/usr.sbin/mergemaster/mergemaster.sh Fri Jul 15 19:43:24 2016 (r302911) +++ stable/11/usr.sbin/mergemaster/mergemaster.sh Fri Jul 15 19:58:05 2016 (r302912) @@ -486,7 +486,7 @@ fi SOURCEDIR=$(realpath "$SOURCEDIR") # Setup make to use system files from SOURCEDIR -MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk" +MM_MAKE="make ${ARCHSTRING} -m ${SOURCEDIR}/share/mk -DNO_FILEMON" # Check DESTDIR against the mergemaster mtree database to see what # files the user changed from the reference files.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607151958.u6FJw5lH000786>