From owner-svn-src-stable@FreeBSD.ORG  Thu Aug 27 17:25:59 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 28B1710656A4;
	Thu, 27 Aug 2009 17:25:59 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 179DA8FC42;
	Thu, 27 Aug 2009 17:25:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7RHPwTA002889;
	Thu, 27 Aug 2009 17:25:58 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7RHPwdM002887;
	Thu, 27 Aug 2009 17:25:58 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <200908271725.n7RHPwdM002887@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 27 Aug 2009 17:25:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196597 - in stable/8/release: . doc
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 27 Aug 2009 17:25:59 -0000

Author: jhb
Date: Thu Aug 27 17:25:58 2009
New Revision: 196597
URL: http://svn.freebsd.org/changeset/base/196597

Log:
  MFC 196522:
  Invoke the recently added mm-mtree.sh release script to store a pre-built
  mergemaster mtree database in the 'base' dist.
  
  Approved by:	re (kib)

Modified:
  stable/8/release/   (props changed)
  stable/8/release/Makefile
  stable/8/release/doc/   (props changed)

Modified: stable/8/release/Makefile
==============================================================================
--- stable/8/release/Makefile	Thu Aug 27 17:24:05 2009	(r196596)
+++ stable/8/release/Makefile	Thu Aug 27 17:25:58 2009	(r196597)
@@ -646,6 +646,7 @@ release.2:
 	cd ${.CURDIR}/.. && ${CROSSMAKE} distrib-dirs DESTDIR=${RD}/trees/base
 	cd ${.CURDIR}/.. && ${CROSSMAKE} ${WORLD_FLAGS} distributeworld \
 	    DISTDIR=${RD}/trees
+	sh ${.CURDIR}/scripts/mm-mtree.sh -F "${CROSSENV}" -D "${RD}/trees/base"
 	touch ${.TARGET}
 
 # Make and install the generic kernel(s).