summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-06-14 16:20:19 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-06-14 16:20:19 +0000
commit2e92e3aeda2801e9820b08eaeacabb3df0b62270 (patch)
treed1e0c6050bda0f77d2375ce2a282fce36c2359c1 /share
parentc04f460780b0777276e47f7434d8394cea681c80 (diff)
downloadFreeBSD-src-2e92e3aeda2801e9820b08eaeacabb3df0b62270.zip
FreeBSD-src-2e92e3aeda2801e9820b08eaeacabb3df0b62270.tar.gz
WITH_META_MODE: Lessen the filemon(4) requirement scope.
- Move the sys.mk filemon requirement to bsd.init.mk as a warning. This is intended only to show when building directly in a subdirectory without filemon loaded. - Move the error into Makefile and only apply it when building from the META_TGT_WHITELIST target list. -DNO_FILEMON can be used to suppress both the warning and the error but makes WITH_META_MODE less useful. It will only compare build commands in this mode rather than track all dependencies. This fixes installing from a jail which doesn't need filemon in this phase [1]. Reported by: Nikolai Lifanov <lifanov@mail.lifanov.com> [1] Approved by: re (implicit) Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
-rw-r--r--share/mk/bsd.init.mk10
-rw-r--r--share/mk/sys.mk4
2 files changed, 10 insertions, 4 deletions
diff --git a/share/mk/bsd.init.mk b/share/mk/bsd.init.mk
index d00b9e5..01d5c47 100644
--- a/share/mk/bsd.init.mk
+++ b/share/mk/bsd.init.mk
@@ -28,4 +28,14 @@ _SKIP_BUILD = not building at level 0
.warning ${_SKIP_BUILD}
.endif
+.if ${MK_META_MODE} == "yes"
+.if !exists(/dev/filemon) && \
+ ${UPDATE_DEPENDFILE:Uyes:tl} != "no" && !defined(NO_FILEMON) && \
+ !make(showconfig)
+.warning The filemon module (/dev/filemon) is not loaded.
+.warning META_MODE is less useful for incremental builds without filemon.
+.warning 'kldload filemon' or pass -DNO_FILEMON to suppress this warning.
+.endif
+.endif # ${MK_META_MODE} == "yes"
+
.endif # !target(__<bsd.init.mk>__)
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index e103fdd..cccc543 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -60,10 +60,6 @@ META_MODE+= missing-meta=yes
META_MODE+= silent=yes
.endif
.if !exists(/dev/filemon)
-.if ${UPDATE_DEPENDFILE:Uyes:tl} != "no" && !defined(NO_FILEMON) && \
- !make(showconfig)
-.error ${.newline}ERROR: The filemon module (/dev/filemon) is not loaded.
-.endif
META_MODE+= nofilemon
.endif
# Require filemon data with bmake
OpenPOWER on IntegriCloud