summaryrefslogtreecommitdiffstats
path: root/etc/mtree
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2015-10-13 19:44:36 +0000
committerbapt <bapt@FreeBSD.org>2015-10-13 19:44:36 +0000
commitc8d6d4a78596005d50c30c7ab4f623a601ef0b39 (patch)
treee5218cae2f48913719be46210d8d92085cb2511f /etc/mtree
parent2a77c3b71d27973d4ffac086902715be69266202 (diff)
parent384c892651c52e57063356328dfcd28914bc4b15 (diff)
downloadFreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.zip
FreeBSD-src-c8d6d4a78596005d50c30c7ab4f623a601ef0b39.tar.gz
Merge from head
Diffstat (limited to 'etc/mtree')
-rw-r--r--etc/mtree/BSD.debug.dist4
-rw-r--r--etc/mtree/BSD.tests.dist12
-rw-r--r--etc/mtree/BSD.usr.dist2
3 files changed, 16 insertions, 2 deletions
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist
index 7504a88..fe5bc48 100644
--- a/etc/mtree/BSD.debug.dist
+++ b/etc/mtree/BSD.debug.dist
@@ -9,6 +9,8 @@
bin
..
boot
+ kernel
+ ..
..
lib
geom
@@ -23,7 +25,7 @@
..
lib
clang
- 3.6.1
+ 3.7.0
lib
freebsd
..
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index 3d2ff51..1fb3365 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -14,6 +14,8 @@
..
expr
..
+ ls
+ ..
mv
..
pax
@@ -240,6 +242,8 @@
test-programs
..
..
+ libarchive
+ ..
libc
c063
..
@@ -308,6 +312,8 @@
..
libutil
..
+ libxo
+ ..
msun
..
..
@@ -514,6 +520,8 @@
..
cmp
..
+ cpio
+ ..
col
..
comm
@@ -552,6 +560,8 @@
..
soelim
..
+ tar
+ ..
timeout
..
tr
@@ -566,6 +576,8 @@
..
xargs
..
+ xo
+ ..
yacc
yacc
..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 8d10c3d8..1bed29c 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -19,7 +19,7 @@
aout
..
clang
- 3.6.1
+ 3.7.0
include
..
lib
OpenPOWER on IntegriCloud