From owner-svn-src-projects@FreeBSD.ORG  Wed Jan 16 00:17:48 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 45C81624;
 Wed, 16 Jan 2013 00:17:48 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 205137D7;
 Wed, 16 Jan 2013 00:17:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0G0HlFB099041;
 Wed, 16 Jan 2013 00:17:48 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0G0HlNf099040;
 Wed, 16 Jan 2013 00:17:47 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <201301160017.r0G0HlNf099040@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Wed, 16 Jan 2013 00:17:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245480 - projects/mtree
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Jan 2013 00:17:48 -0000

Author: brooks
Date: Wed Jan 16 00:17:47 2013
New Revision: 245480
URL: http://svnweb.freebsd.org/changeset/base/245480

Log:
  Checkpoint NO_ROOT support for distributeworld and packageworld.  They
  work except that there aren't any directories in the metadata logs or
  the resulting tarballs.

Modified:
  projects/mtree/Makefile.inc1

Modified: projects/mtree/Makefile.inc1
==============================================================================
--- projects/mtree/Makefile.inc1	Tue Jan 15 23:34:24 2013	(r245479)
+++ projects/mtree/Makefile.inc1	Wed Jan 16 00:17:47 2013	(r245480)
@@ -351,7 +351,8 @@ LIB32IMAKE=	${LIB32WMAKE:NINSTALL=*:NDES
 
 .if defined(NO_ROOT)
 METALOG?=	${DESTDIR}/${DISTDIR}/METALOG
-INSTALLFLAGS=	-U -M ${METALOG} -D ${DESTDIR}
+INSTALL_DDIR=	${DESTDIR}/${DISTDIR}
+INSTALLFLAGS=	-U -M ${METALOG} -D ${INSTALL_DDIR:S://:/:g}
 MTREEFLAGS=	-W
 .endif
 
@@ -667,7 +668,7 @@ _zoneinfo=	zic tzsetup xargs
 .endif
 
 ITOOLS=	[ awk cap_mkdb cat chflags chmod chown \
-	date echo egrep find grep id ${_install-info} \
+	date echo egrep find grep id install ${_install-info} \
 	ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
 	test true uname wc ${_zoneinfo}
 
@@ -712,7 +713,9 @@ distributeworld installworld: installche
 	    done); \
 	cp $$libs $$progs ${INSTALLTMP}
 	cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale
-	rm -f ${METALOG}
+.if defined(NO_ROOT)
+	echo "#mtree v2.0" > ${METALOG}
+.endif
 .if make(distributeworld)
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	-mkdir ${DESTDIR}/${DISTDIR}/${dist}
@@ -733,12 +736,27 @@ distributeworld installworld: installche
 .for dist in ${EXTRA_DISTRIBUTIONS}
 	find ${DESTDIR}/${DISTDIR}/${dist} -empty -delete
 .endfor
+.if defined(NO_ROOT)
+.for dist in base ${EXTRA_DISTRIBUTIONS}
+	#echo "#mtree 2.0" > ${DESTDIR}/${DISTDIR}/${dist}.meta
+	#grep ./${dist}/ ${METALOG} | sed -e s#^./${dist}/#./# >> \
+	#    ${DESTDIR}/${DISTDIR}/${dist}.meta
+	awk 'BEGIN { print "#mtree 2.0" } /^\.\/${dist}\// {sub(/^\.\/${dist}\//, "./"); print}' < \
+	    ${METALOG} > ${DESTDIR}/${DISTDIR}/${dist}.meta
+.endfor
+.endif
 .endif
 
 packageworld:
 .for dist in base ${EXTRA_DISTRIBUTIONS}
+.if defined(NO_ROOT)
+	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
+	    @${DESTDIR}/${DISTDIR}/${dist}.meta
+.else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz .
+.endif
 .endfor
 
 #