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

1 files changed, 5 insertions, 8 deletions

diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 6d02ac6..4a1ba19 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -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