diff options
| author | bapt <bapt@FreeBSD.org> | 2015-11-01 21:17:38 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-11-01 21:17:38 +0000 |
| commit | 1477bec6db952893631d0121f1a0b921b7352899 (patch) | |
| tree | d7eefbc43ae961805537882e088a954e7b9cf530 /etc/mtree | |
| parent | e29f1d2f891c995886c7e37be37546b3dfd29efd (diff) | |
| parent | a23a95f981ff4d4789caf8a8349c8b017b1ac351 (diff) | |
| download | FreeBSD-src-1477bec6db952893631d0121f1a0b921b7352899.zip FreeBSD-src-1477bec6db952893631d0121f1a0b921b7352899.tar.gz | |
Merge from head
Diffstat (limited to 'etc/mtree')
| -rw-r--r-- | etc/mtree/BSD.debug.dist | 6 | ||||
| -rw-r--r-- | etc/mtree/BSD.lib32.dist | 14 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 6 | ||||
| -rw-r--r-- | etc/mtree/Makefile | 4 |
5 files changed, 22 insertions, 12 deletions
diff --git a/etc/mtree/BSD.debug.dist b/etc/mtree/BSD.debug.dist index 8df0a72..e760e01 100644 --- a/etc/mtree/BSD.debug.dist +++ b/etc/mtree/BSD.debug.dist @@ -41,12 +41,6 @@ private .. .. - lib32 - i18n - .. - private - .. - .. libexec bsdinstall .. diff --git a/etc/mtree/BSD.lib32.dist b/etc/mtree/BSD.lib32.dist new file mode 100644 index 0000000..a82368f --- /dev/null +++ b/etc/mtree/BSD.lib32.dist @@ -0,0 +1,14 @@ +# $FreeBSD$ +# +# Please see the file src/etc/mtree/README before making changes to this file. +# + +/set type=dir uname=root gname=wheel mode=0755 +. + lib32 + dtrace + .. + i18n + .. + .. +.. diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 8d29323..8cdc2fc 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -275,6 +275,8 @@ data .. .. + rpc + .. ssp .. stdio @@ -596,6 +598,8 @@ .. fstyp .. + makefs + .. newsyslog .. nmtree diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 12ee777..0dd1ea4 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -43,12 +43,6 @@ .. .. .. - lib32 - dtrace - .. - i18n - .. - .. libdata gcc .. diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index afed370..1a941e4 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -5,6 +5,7 @@ FILES= ${_BSD.debug.dist} \ BSD.include.dist \ BSD.root.dist \ + ${_BSD.lib32.dist} \ ${_BSD.sendmail.dist} \ ${_BSD.tests.dist} \ BSD.usr.dist \ @@ -16,6 +17,9 @@ _BSD.debug.dist= BSD.debug.dist .if ${MK_GROFF} != "no" _BSD.groff.dist= BSD.groff.dist .endif +.if ${MK_LIB32} != "no" +_BSD.lib32.dist= BSD.lib32.dist +.endif .if ${MK_SENDMAIL} != "no" _BSD.sendmail.dist= BSD.sendmail.dist .endif |
