From owner-svn-src-head@freebsd.org  Tue Jan 23 17:59:07 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF72EEBBE5C;
 Tue, 23 Jan 2018 17:59:07 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id AA9703496;
 Tue, 23 Jan 2018 17:59:07 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E4A5C11DD7;
 Tue, 23 Jan 2018 17:59:06 +0000 (UTC)
 (envelope-from kevans@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0NHx6n6080453;
 Tue, 23 Jan 2018 17:59:06 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0NHx6Qq080451;
 Tue, 23 Jan 2018 17:59:06 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201801231759.w0NHx6Qq080451@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kevans set sender to
 kevans@FreeBSD.org using -f
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 23 Jan 2018 17:59:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r328287 - in head/etc: . mtree
X-SVN-Group: head
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: in head/etc: . mtree
X-SVN-Commit-Revision: 328287
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Jan 2018 17:59:07 -0000

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
         ..