diff options
| -rw-r--r-- | targets/pseudo/userland/Makefile.depend | 2 | ||||
| -rw-r--r-- | usr.sbin/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/fmtree/Makefile (renamed from usr.sbin/mtree/Makefile) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/Makefile.depend (renamed from usr.sbin/mtree/Makefile.depend) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/compare.c (renamed from usr.sbin/mtree/compare.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/create.c (renamed from usr.sbin/mtree/create.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/excludes.c (renamed from usr.sbin/mtree/excludes.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/extern.h (renamed from usr.sbin/mtree/extern.h) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/misc.c (renamed from usr.sbin/mtree/misc.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/mtree.8 (renamed from usr.sbin/mtree/mtree.8) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/mtree.c (renamed from usr.sbin/mtree/mtree.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/mtree.h (renamed from usr.sbin/mtree/mtree.h) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/spec.c (renamed from usr.sbin/mtree/spec.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/specspec.c (renamed from usr.sbin/mtree/specspec.c) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test00.sh (renamed from usr.sbin/mtree/test/test00.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test01.sh (renamed from usr.sbin/mtree/test/test01.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test02.sh (renamed from usr.sbin/mtree/test/test02.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test03.sh (renamed from usr.sbin/mtree/test/test03.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test04.sh (renamed from usr.sbin/mtree/test/test04.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/test/test05.sh (renamed from usr.sbin/mtree/test/test05.sh) | 0 | ||||
| -rw-r--r-- | usr.sbin/fmtree/verify.c (renamed from usr.sbin/mtree/verify.c) | 0 |
21 files changed, 2 insertions, 2 deletions
diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index cbd2ca5f919c..de33878e3209 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -512,6 +512,7 @@ DIRDEPS+= \ usr.sbin/fifolog/fifolog_writer \ usr.sbin/fifolog/fifolog_reader \ usr.sbin/flowctl \ + usr.sbin/fmtree \ usr.sbin/freebsd-update \ usr.sbin/fwcontrol \ usr.sbin/genrandom \ @@ -567,7 +568,6 @@ DIRDEPS+= \ usr.sbin/mpsutil \ usr.sbin/mptutil \ usr.sbin/mtest \ - usr.sbin/mtree \ usr.sbin/named \ usr.sbin/named-checkconf \ usr.sbin/named-checkzone \ diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index acc8043fe07f..4f003029477e 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -155,7 +155,7 @@ SUBDIR+= fdwrite .endif .if ${MK_FMTREE} != "no" -SUBDIR+= mtree +SUBDIR+= fmtree .endif .if ${MK_FREEBSD_UPDATE} != "no" diff --git a/usr.sbin/mtree/Makefile b/usr.sbin/fmtree/Makefile index 6d060e2d28fd..6d060e2d28fd 100644 --- a/usr.sbin/mtree/Makefile +++ b/usr.sbin/fmtree/Makefile diff --git a/usr.sbin/mtree/Makefile.depend b/usr.sbin/fmtree/Makefile.depend index 064e492dd3e7..064e492dd3e7 100644 --- a/usr.sbin/mtree/Makefile.depend +++ b/usr.sbin/fmtree/Makefile.depend diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/fmtree/compare.c index fdd37679c6ea..fdd37679c6ea 100644 --- a/usr.sbin/mtree/compare.c +++ b/usr.sbin/fmtree/compare.c diff --git a/usr.sbin/mtree/create.c b/usr.sbin/fmtree/create.c index 8be9b02173ea..8be9b02173ea 100644 --- a/usr.sbin/mtree/create.c +++ b/usr.sbin/fmtree/create.c diff --git a/usr.sbin/mtree/excludes.c b/usr.sbin/fmtree/excludes.c index 21a49b04f744..21a49b04f744 100644 --- a/usr.sbin/mtree/excludes.c +++ b/usr.sbin/fmtree/excludes.c diff --git a/usr.sbin/mtree/extern.h b/usr.sbin/fmtree/extern.h index 4b6fb3c1839a..4b6fb3c1839a 100644 --- a/usr.sbin/mtree/extern.h +++ b/usr.sbin/fmtree/extern.h diff --git a/usr.sbin/mtree/misc.c b/usr.sbin/fmtree/misc.c index 65667d601138..65667d601138 100644 --- a/usr.sbin/mtree/misc.c +++ b/usr.sbin/fmtree/misc.c diff --git a/usr.sbin/mtree/mtree.8 b/usr.sbin/fmtree/mtree.8 index fd073b926eb1..fd073b926eb1 100644 --- a/usr.sbin/mtree/mtree.8 +++ b/usr.sbin/fmtree/mtree.8 diff --git a/usr.sbin/mtree/mtree.c b/usr.sbin/fmtree/mtree.c index e90a5bbca1d3..e90a5bbca1d3 100644 --- a/usr.sbin/mtree/mtree.c +++ b/usr.sbin/fmtree/mtree.c diff --git a/usr.sbin/mtree/mtree.h b/usr.sbin/fmtree/mtree.h index fb22f0d62370..fb22f0d62370 100644 --- a/usr.sbin/mtree/mtree.h +++ b/usr.sbin/fmtree/mtree.h diff --git a/usr.sbin/mtree/spec.c b/usr.sbin/fmtree/spec.c index 417932db4310..417932db4310 100644 --- a/usr.sbin/mtree/spec.c +++ b/usr.sbin/fmtree/spec.c diff --git a/usr.sbin/mtree/specspec.c b/usr.sbin/fmtree/specspec.c index f85882e0deef..f85882e0deef 100644 --- a/usr.sbin/mtree/specspec.c +++ b/usr.sbin/fmtree/specspec.c diff --git a/usr.sbin/mtree/test/test00.sh b/usr.sbin/fmtree/test/test00.sh index fce801bcd20e..fce801bcd20e 100644 --- a/usr.sbin/mtree/test/test00.sh +++ b/usr.sbin/fmtree/test/test00.sh diff --git a/usr.sbin/mtree/test/test01.sh b/usr.sbin/fmtree/test/test01.sh index e4d3fc302bfe..e4d3fc302bfe 100644 --- a/usr.sbin/mtree/test/test01.sh +++ b/usr.sbin/fmtree/test/test01.sh diff --git a/usr.sbin/mtree/test/test02.sh b/usr.sbin/fmtree/test/test02.sh index a7aa9168382c..a7aa9168382c 100644 --- a/usr.sbin/mtree/test/test02.sh +++ b/usr.sbin/fmtree/test/test02.sh diff --git a/usr.sbin/mtree/test/test03.sh b/usr.sbin/fmtree/test/test03.sh index bb3a5b5397e0..bb3a5b5397e0 100644 --- a/usr.sbin/mtree/test/test03.sh +++ b/usr.sbin/fmtree/test/test03.sh diff --git a/usr.sbin/mtree/test/test04.sh b/usr.sbin/fmtree/test/test04.sh index 38acda2bf469..38acda2bf469 100644 --- a/usr.sbin/mtree/test/test04.sh +++ b/usr.sbin/fmtree/test/test04.sh diff --git a/usr.sbin/mtree/test/test05.sh b/usr.sbin/fmtree/test/test05.sh index eda544f4ff36..eda544f4ff36 100644 --- a/usr.sbin/mtree/test/test05.sh +++ b/usr.sbin/fmtree/test/test05.sh diff --git a/usr.sbin/mtree/verify.c b/usr.sbin/fmtree/verify.c index c9291c00e218..c9291c00e218 100644 --- a/usr.sbin/mtree/verify.c +++ b/usr.sbin/fmtree/verify.c |