From owner-svn-src-stable@FreeBSD.ORG  Thu Dec  6 00:25:42 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id C47724C8;
 Thu,  6 Dec 2012 00:25:42 +0000 (UTC) (envelope-from gjb@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 A8EED8FC13;
 Thu,  6 Dec 2012 00:25:42 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB60PgVQ018180;
 Thu, 6 Dec 2012 00:25:42 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB60PgKL018179;
 Thu, 6 Dec 2012 00:25:42 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201212060025.qB60PgKL018179@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Thu, 6 Dec 2012 00:25:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r243923 - stable/9/release
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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, 06 Dec 2012 00:25:42 -0000

Author: gjb (doc,ports committer)
Date: Thu Dec  6 00:25:42 2012
New Revision: 243923
URL: http://svnweb.freebsd.org/changeset/base/243923

Log:
  MFC r242897:
   Prevent including .zfs snapshot directories in the src.txz
   distribution.  This can happen if the src/ tree checkout is
   within its own ZFS dataset, and the 'snapdir' ZFS property
   is set to 'visible.'

Modified:
  stable/9/release/Makefile
Directory Properties:
  stable/9/release/   (props changed)

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Thu Dec  6 00:17:25 2012	(r243922)
+++ stable/9/release/Makefile	Thu Dec  6 00:25:42 2012	(r243923)
@@ -80,7 +80,7 @@ kernel.txz:
 src.txz:
 	-mkdir -p ${DISTDIR}/usr
 	ln -fs ${WORLDDIR} ${DISTDIR}/usr/src
-	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn \
+	cd ${DISTDIR} && tar cLvJf ${.OBJDIR}/src.txz --exclude .svn --exclude .zfs \
 	    --exclude CVS --exclude @ --exclude usr/src/release/dist usr/src
 
 ports.txz: