From owner-svn-src-head@FreeBSD.ORG  Tue Jan  6 20:42:52 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id F063437B;
 Tue,  6 Jan 2015 20:42:51 +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 DBE976CA;
 Tue,  6 Jan 2015 20:42:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t06Kgp4M021320;
 Tue, 6 Jan 2015 20:42:51 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t06KgpZm021319;
 Tue, 6 Jan 2015 20:42:51 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201501062042.t06KgpZm021319@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: Tue, 6 Jan 2015 20:42:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276765 - 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: Tue, 06 Jan 2015 20:42:52 -0000

Author: gjb
Date: Tue Jan  6 20:42:50 2015
New Revision: 276765
URL: https://svnweb.freebsd.org/changeset/base/276765

Log:
  Update pkg-stage.sh to be compatible with pkg-1.4.x.
  
  In 1.3.x and earlier, ABI format is, for example,
  freebsd:11:x86:64.
  
  In 1.4.x, ABI format is FreeBSD:11:amd64, and a new
  configuration entry, ALTABI, is: freebsd:11:x86:64.
  
  Export PKG_ABI and PKG_ALTABI accordingly, and if
  PKG_ALTABI is set, create a symlink within the dvd
  PKG_CACHEDIR so both new and old ABI directories
  exist.
  
  MFC after:	3 days
  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	Tue Jan  6 20:10:42 2015	(r276764)
+++ head/release/scripts/pkg-stage.sh	Tue Jan  6 20:42:50 2015	(r276765)
@@ -40,10 +40,15 @@ if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
+export DVD_DIR="dvd/packages"
 export PKG_ABI=$(pkg config ABI)
-export PKG_REPODIR="dvd/packages/${PKG_ABI}"
+export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null)
+export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}"
 
 /bin/mkdir -p ${PKG_REPODIR}
+if [ ! -z "${PKG_ALTABI}" ]; then
+	ln -s ${PKG_ABI} ${PKG_ALTABI}
+fi
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv