From owner-svn-src-stable-11@freebsd.org  Tue Jan 30 19:21:00 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 213D0EDD483;
 Tue, 30 Jan 2018 19:21:00 +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 C70177C9D7;
 Tue, 30 Jan 2018 19:20:59 +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 C1F7A1B600;
 Tue, 30 Jan 2018 19:20:59 +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 w0UJKxub055288;
 Tue, 30 Jan 2018 19:20:59 GMT (envelope-from kevans@FreeBSD.org)
Received: (from kevans@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0UJKxIG055286;
 Tue, 30 Jan 2018 19:20:59 GMT (envelope-from kevans@FreeBSD.org)
Message-Id: <201801301920.w0UJKxIG055286@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, 30 Jan 2018 19:20:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r328600 - in stable/11/etc: . mtree
X-SVN-Group: stable-11
X-SVN-Commit-Author: kevans
X-SVN-Commit-Paths: in stable/11/etc: . mtree
X-SVN-Commit-Revision: 328600
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Jan 2018 19:21:00 -0000

Author: kevans
Date: Tue Jan 30 19:20:59 2018
New Revision: 328600
URL: https://svnweb.freebsd.org/changeset/base/328600

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

Modified:
  stable/11/etc/Makefile
  stable/11/etc/mtree/BSD.root.dist
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/etc/Makefile
==============================================================================
--- stable/11/etc/Makefile	Tue Jan 30 19:16:38 2018	(r328599)
+++ stable/11/etc/Makefile	Tue Jan 30 19:20:59 2018	(r328600)
@@ -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

Modified: stable/11/etc/mtree/BSD.root.dist
==============================================================================
--- stable/11/etc/mtree/BSD.root.dist	Tue Jan 30 19:16:38 2018	(r328599)
+++ stable/11/etc/mtree/BSD.root.dist	Tue Jan 30 19:20:59 2018	(r328600)
@@ -18,7 +18,7 @@
         ..
         modules
         ..
-        overlays
+        overlays              tags=package=runtime
         ..
         zfs
         ..