From owner-svn-src-head@FreeBSD.ORG  Sun Nov 11 21:52:19 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 0C8AC10A;
 Sun, 11 Nov 2012 21:52:19 +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 E66978FC14;
 Sun, 11 Nov 2012 21:52:18 +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 qABLqIfk005093;
 Sun, 11 Nov 2012 21:52:18 GMT (envelope-from gjb@svn.freebsd.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qABLqIol005092;
 Sun, 11 Nov 2012 21:52:18 GMT (envelope-from gjb@svn.freebsd.org)
Message-Id: <201211112152.qABLqIol005092@svn.freebsd.org>
From: Glen Barber <gjb@FreeBSD.org>
Date: Sun, 11 Nov 2012 21:52:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r242897 - head/release
X-SVN-Group: head
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.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Nov 2012 21:52:19 -0000

Author: gjb (doc,ports committer)
Date: Sun Nov 11 21:52:18 2012
New Revision: 242897
URL: http://svnweb.freebsd.org/changeset/base/242897

Log:
  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.'
  
  Approved by:	hrs
  MFC after:	3 days
  X-MFC-To:	stable/9 only

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Sun Nov 11 15:34:58 2012	(r242896)
+++ head/release/Makefile	Sun Nov 11 21:52:18 2012	(r242897)
@@ -83,7 +83,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: