svn commit: r271608 - stable/10/release/scripts

[Glen Barber]

Author: gjb
Date: Mon Sep 15 02:21:34 2014
New Revision: 271608
URL: http://svnweb.freebsd.org/changeset/base/271608

Log:
  MFC r271480, r271483, r271491:
  
  r271480:
    Set PKG_CACHEDIR to an 'All/' directory one level lower
    to fix 'pkg repo' generating repository metadata for the
    on-disc packages.
  
  r271483:
    Fix duplicate PKG_ABI in the PKG_CACHEDIR path.
  
  r271491:
    Simplify dvd package population with pkg-1.3.
  
  Approved by:	re (rodrigc)
  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	Sun Sep 14 23:48:18 2014	(r271607)
+++ stable/10/release/scripts/pkg-stage.sh	Mon Sep 15 02:21:34 2014	(r271608)
@@ -40,20 +40,17 @@ 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_CACHEDIR="dvd/packages/${PKG_ABI}"
+export PKG_ABI=$(pkg config ABI)
+export PKG_REPODIR="dvd/packages/${PKG_ABI}"
 
-/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_CACHEDIR}
+${PKGCMD} repo ${PKG_REPODIR}
 
 # Always exit '0', even if pkg(8) complains about conflicts.
 exit 0