svn commit: r328287 - in head/etc: . mtree
Kyle Evans
kevans at FreeBSD.org
Tue Jan 23 17:59:07 UTC 2018
Author: kevans
Date: Tue Jan 23 17:59:06 2018
New Revision: 328287
URL: https://svnweb.freebsd.org/changeset/base/328287
Log:
Add /boot/overlays to runtime pkg, fix distrib-dirs METALOG generation
/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.
Reviewed by: bapt, gjb
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D13996
Modified:
head/etc/Makefile
head/etc/mtree/BSD.root.dist
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Tue Jan 23 17:54:39 2018 (r328286)
+++ head/etc/Makefile Tue Jan 23 17:59:06 2018 (r328287)
@@ -379,10 +379,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
Modified: head/etc/mtree/BSD.root.dist
==============================================================================
--- head/etc/mtree/BSD.root.dist Tue Jan 23 17:54:39 2018 (r328286)
+++ head/etc/mtree/BSD.root.dist Tue Jan 23 17:59:06 2018 (r328287)
@@ -18,7 +18,7 @@
..
modules
..
- overlays
+ overlays tags=package=runtime
..
zfs
..
More information about the svn-src-all
mailing list