From owner-svn-src-all@FreeBSD.ORG  Fri Sep 19 17:23:45 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 0048E1F4;
 Fri, 19 Sep 2014 17:23:44 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E05CBE1;
 Fri, 19 Sep 2014 17:23:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8JHNiKL036301;
 Fri, 19 Sep 2014 17:23:44 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8JHNilf036300;
 Fri, 19 Sep 2014 17:23:44 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409191723.s8JHNilf036300@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 19 Sep 2014 17:23:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271876 - head/release/scripts
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Sep 2014 17:23:45 -0000

Author: gjb
Date: Fri Sep 19 17:23:44 2014
New Revision: 271876
URL: http://svnweb.freebsd.org/changeset/base/271876

Log:
  When populating the dvd/packages/ directory, create
  a symlink to All/pkg-*.txz in the Latest/ directory.
  
  This allows 'pkg bootstrap' to work out-of-box if
  the REPOS_DIR environment is properly set.
  
  Tested on:	stable/10@r271848
  MFC after:	3 days
  X-MFC-10.1:	yes
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/scripts/pkg-stage.sh

Modified: head/release/scripts/pkg-stage.sh
==============================================================================
--- head/release/scripts/pkg-stage.sh	Fri Sep 19 17:18:27 2014	(r271875)
+++ head/release/scripts/pkg-stage.sh	Fri Sep 19 17:23:44 2014	(r271876)
@@ -50,6 +50,12 @@ ${PKGCMD} -vv
 ${PKGCMD} update -f
 ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
+# Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works
+# using the on-disc packages.
+mkdir -p ${PKG_REPODIR}/Latest
+(cd ${PKG_REPODIR}/Latest && \
+	ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).txz pkg.txz)
+
 ${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.