svn commit: r302674 - in head/usr.sbin: etcupdate mergemaster

[Bryan Drewery]

Author: bdrewery
Date: Tue Jul 12 19:47:01 2016
New Revision: 302674
URL: https://svnweb.freebsd.org/changeset/base/302674

Log:
  META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)
  
  New .meta files will be created without filemon data, but any future build
  that wants filemon data will force a rebuild due to the missing data
  due to use of bmake's .MAKE.MODE=missing-filemon=yes feature.
  
  Reported by:	np
  Sponsored by:	EMC / Isilon Storage Division
  MFC after:	3 days

Modified:
  head/usr.sbin/etcupdate/etcupdate.sh
  head/usr.sbin/mergemaster/mergemaster.sh

Modified: head/usr.sbin/etcupdate/etcupdate.sh
==============================================================================
--- head/usr.sbin/etcupdate/etcupdate.sh	Tue Jul 12 19:34:10 2016	(r302673)
+++ head/usr.sbin/etcupdate/etcupdate.sh	Tue Jul 12 19:47:01 2016	(r302674)
@@ -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: head/usr.sbin/mergemaster/mergemaster.sh
==============================================================================
--- head/usr.sbin/mergemaster/mergemaster.sh	Tue Jul 12 19:34:10 2016	(r302673)
+++ head/usr.sbin/mergemaster/mergemaster.sh	Tue Jul 12 19:47:01 2016	(r302674)
@@ -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.