svn commit: r271491 - head/release/scripts

[Glen Barber]

Author: gjb
Date: Fri Sep 12 22:20:07 2014
New Revision: 271491
URL: http://svnweb.freebsd.org/changeset/base/271491

Log:
  Simplify dvd package population with pkg-1.3.
  
  Submitted by:	bdrewery
  MFC after:	3 days
  X-MFC-With:	r271480, r271483
  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 21:56:57 2014	(r271490)
+++ head/release/scripts/pkg-stage.sh	Fri Sep 12 22:20:07 2014	(r271491)
@@ -40,19 +40,15 @@ if [ ! -x /usr/local/sbin/pkg ]; then
 	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
 fi
 
-PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
-PKG_ABI="${PKG_ABI%\";}"
-PKG_ABI="${PKG_ABI#\"}"
-export PKG_ABI
+export PKG_ABI=$(pkg config ABI)
 export PKG_REPODIR="dvd/packages/${PKG_ABI}"
-export PKG_CACHEDIR="${PKG_REPODIR}/All"
 
-/bin/mkdir -p ${PKG_CACHEDIR}
+/bin/mkdir -p ${PKG_REPODIR}
 
 # Print pkg(8) information to make debugging easier.
 ${PKGCMD} -vv
 ${PKGCMD} update -f
-${PKGCMD} fetch -d ${DVD_PACKAGES}
+${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES}
 
 ${PKGCMD} repo ${PKG_REPODIR}