diff options
| author | kevans <kevans@FreeBSD.org> | 2018-01-30 19:20:59 +0000 |
|---|---|---|
| committer | kevans <kevans@FreeBSD.org> | 2018-01-30 19:20:59 +0000 |
| commit | 10b842d4bda530b9a55c43faab951dd9def301bb (patch) | |
| tree | 3906ec506b0b3b1b2b9df66c018a800125f34670 /etc | |
| parent | d3a9144a73ad565126e63c40cada6f8f2ede9dd5 (diff) | |
| download | FreeBSD-src-10b842d4bda530b9a55c43faab951dd9def301bb.zip FreeBSD-src-10b842d4bda530b9a55c43faab951dd9def301bb.tar.gz | |
MFC r328287: Add /boot/overlays to runtime pkg, fix distrib-dirs METALOG
/boot/overlays was recently added without belonging to a package. It's only
used by bootloaders at the moment, so add it to the 'runtime' package to get
added with ubldr and friends.
Fix distrib-dirs METALOG generation while we're here. History elsewhere
seems to indicate that bapt@ fixed this to pull in all attributes from
mtrees while generating the METALOG. This fix got clobbered somewhere later,
so restore it.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.root.dist | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/Makefile b/etc/Makefile index e3862c2..319aed0 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -388,10 +388,10 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY d=${DISTBASE}$$d; \ shift; \ test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \ - ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \ + ${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K all | " \ "sed s#^\.#.$$d# | ${METALOG.add}" ; \ ${MTREE_FILTER} $$m | \ - ${MTREE_CMD:N-W} -C -K uname,gname | sed s#^\.#.$$d# | \ + ${MTREE_CMD:N-W} -C -K all | sed s#^\.#.$$d# | \ ${METALOG.add} ; \ done; true .endif diff --git a/etc/mtree/BSD.root.dist b/etc/mtree/BSD.root.dist index 5d62567..fc489c7 100644 --- a/etc/mtree/BSD.root.dist +++ b/etc/mtree/BSD.root.dist @@ -18,7 +18,7 @@ .. modules .. - overlays + overlays tags=package=runtime .. zfs .. |
