aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-09-12 22:20:07 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-09-12 22:20:07 +0000
commit53bdd39b8a52784afb7406014764254a653400a8 (patch)
treea18774c49b805f42e4b4952018b49d42ad0163ea /release/scripts
parent8374717dc0751bd5023989f239f2dc2ff40b3eca (diff)
downloadsrc-53bdd39b8a52784afb7406014764254a653400a8.tar.gz
src-53bdd39b8a52784afb7406014764254a653400a8.zip
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
Notes
Notes: svn path=/head/; revision=271491
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/pkg-stage.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 0204d8cad422..4a1ba19dc161 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -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}