diff options
| author | brooks <brooks@FreeBSD.org> | 2014-03-01 04:25:52 +0000 |
|---|---|---|
| committer | brooks <brooks@FreeBSD.org> | 2014-03-01 04:25:52 +0000 |
| commit | ac9b0c8c582fde71483b514e5fdfa5cdf703072d (patch) | |
| tree | 28fd4c2eb3edc7f8b7229387f33895e229963fce | |
| parent | 33b9ca9ab1e84f2fbd3154eb278624e7f535e144 (diff) | |
| download | FreeBSD-src-ac9b0c8c582fde71483b514e5fdfa5cdf703072d.zip FreeBSD-src-ac9b0c8c582fde71483b514e5fdfa5cdf703072d.tar.gz | |
MFC r261299:
Merge from CheriBSD:
commit 2d581e8caf79d7a0f5a24590eccd06da90cccb74
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date: Mon Jan 27 22:57:51 2014 +0000
Add WITHOUT_FMTREE to disable building fmtree.
Sponsored by: DARPA, AFRL
| -rw-r--r-- | share/mk/bsd.own.mk | 1 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 5 | ||||
| -rw-r--r-- | tools/build/options/WITHOUT_FMTREE | 3 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 6 |
4 files changed, 14 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index ff16d2a..a1876a0 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -274,6 +274,7 @@ __DEFAULT_YES_OPTIONS = \ ED_CRYPTO \ EXAMPLES \ FLOPPY \ + FMTREE \ FORMAT_EXTENSIONS \ FORTH \ FP_LIBC \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 08986aa..a8e17fe 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -630,6 +630,11 @@ OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/libexec/cc1plus .endif +.if ${MK_FMTREE} == no +OLD_FILES+=usr/sbin/fmtree +OLD_FILES+=usr/share/man/man8/fmtree.8.gz +.endif + .if ${MK_GNUCXX} == no OLD_FILES+=usr/bin/g++ OLD_FILES+=usr/include/c++/4.2/algorithm diff --git a/tools/build/options/WITHOUT_FMTREE b/tools/build/options/WITHOUT_FMTREE new file mode 100644 index 0000000..f8225c1 --- /dev/null +++ b/tools/build/options/WITHOUT_FMTREE @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to not build and install +.Pa /usr/sbin/fmtree . diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index b58d674..5f275a6 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -48,7 +48,7 @@ SUBDIR= adduser \ mountd \ mptutil \ mtest \ - mtree \ + ${_mtree} \ newsyslog \ nfscbd \ nfsd \ @@ -142,6 +142,10 @@ SUBDIR+= fdread SUBDIR+= fdwrite .endif +.if ${MK_FMTREE} != "no" +SUBDIR+= mtree +.endif + .if ${MK_FREEBSD_UPDATE} != "no" SUBDIR+= freebsd-update .endif |
