From owner-svn-src-head@FreeBSD.ORG  Fri Sep 12 18:52:02 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@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 F19AFCC4;
 Fri, 12 Sep 2014 18:52:01 +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 DD576A3E;
 Fri, 12 Sep 2014 18:52:01 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CIq1o6099610;
 Fri, 12 Sep 2014 18:52:01 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8CIq1Eg099609;
 Fri, 12 Sep 2014 18:52:01 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201409121852.s8CIq1Eg099609@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, 12 Sep 2014 18:52:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r271480 - 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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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: Fri, 12 Sep 2014 18:52:02 -0000

Author: gjb
Date: Fri Sep 12 18:52:01 2014
New Revision: 271480
URL: http://svnweb.freebsd.org/changeset/base/271480

Log:
  Set PKG_CACHEDIR to an 'All/' directory one level lower
  to fix 'pkg repo' generating repository metadata for the
  on-disc packages.
  
  MFC after:	3 days
  X-MFC-to-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 12 18:31:44 2014	(r271479)
+++ head/release/scripts/pkg-stage.sh	Fri Sep 12 18:52:01 2014	(r271480)
@@ -44,7 +44,8 @@ PKG_ABI=$(pkg -vv | grep ^ABI | awk '{pr
 PKG_ABI="${PKG_ABI%\";}"
 PKG_ABI="${PKG_ABI#\"}"
 export PKG_ABI
-export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PKG_REPODIR="dvd/packages/${PKG_ABI}"
+export PKG_CACHEDIR="${PKG_REPODIR}/${PKG_ABI}/All"
 
 /bin/mkdir -p ${PKG_CACHEDIR}
 
@@ -53,7 +54,7 @@ ${PKGCMD} -vv
 ${PKGCMD} update -f
 ${PKGCMD} fetch -d ${DVD_PACKAGES}
 
-${PKGCMD} repo ${PKG_CACHEDIR}
+${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.
 exit 0