mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-02 12:20:51 +00:00
Code Issues Releases Activity

META_MODE: Don't require filemon(4) for mergemaster(8)/etcupdate(8)

Browse Source 
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
This commit is contained in:
Bryan Drewery 2016-07-12 19:47:01 +00:00
parent 32b0a21e43
commit ffe0dde6c6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=302674
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/etcupdate/etcupdate.sh
View File

@ -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

2
usr.sbin/mergemaster/mergemaster.sh
View File

@ -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.