From owner-svn-src-stable@FreeBSD.ORG Mon Sep 22 05:00:55 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@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 D9B09495;
Mon, 22 Sep 2014 05:00:55 +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 C5041950;
Mon, 22 Sep 2014 05:00:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8M50tbG032789;
Mon, 22 Sep 2014 05:00:55 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8M50tjp032788;
Mon, 22 Sep 2014 05:00:55 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409220500.s8M50tjp032788@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: Mon, 22 Sep 2014 05:00:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r271943 - stable/10/release/scripts
X-SVN-Group: stable-10
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.18-1
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: Mon, 22 Sep 2014 05:00:56 -0000
Author: gjb
Date: Mon Sep 22 05:00:55 2014
New Revision: 271943
URL: http://svnweb.freebsd.org/changeset/base/271943
Log:
MFC r271876:
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.
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/scripts/pkg-stage.sh
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/scripts/pkg-stage.sh
==============================================================================
--- stable/10/release/scripts/pkg-stage.sh Mon Sep 22 01:17:48 2014 (r271942)
+++ stable/10/release/scripts/pkg-stage.sh Mon Sep 22 05:00:55 2014 (r271943)
@@ -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.