mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-14 20:37:06 +00:00
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
This commit is contained in:
parent
32b0a21e43
commit
ffe0dde6c6
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=302674
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in a new issue