aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-09-12 18:52:01 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-09-12 18:52:01 +0000
commit017717d87fa81547ee3668df7f14f6cf52cf137a (patch)
treef334f81f7548b1c9d363ab36099c3c4b51dcdcec /release/scripts
parentcb8a6260559bf04d574420756dace0f635359a65 (diff)
downloadsrc-017717d87fa81547ee3668df7f14f6cf52cf137a.tar.gz
src-017717d87fa81547ee3668df7f14f6cf52cf137a.zip
Set PKG_CACHEDIR to an 'All/' directory one level lower
to fix 'pkg repo' generating repository metadata for the on-disc packages. MFC after: 3 days X-MFC-to-10.1: yes Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=271480
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/pkg-stage.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 6d02ac630f21..d43bf0ae6e09 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -44,7 +44,8 @@ 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_REPODIR="dvd/packages/${PKG_ABI}"
+export PKG_CACHEDIR="${PKG_REPODIR}/${PKG_ABI}/All"
/bin/mkdir -p ${PKG_CACHEDIR}
@@ -53,7 +54,7 @@ ${PKGCMD} -vv
${PKGCMD} update -f
${PKGCMD} fetch -d ${DVD_PACKAGES}
-${PKGCMD} repo ${PKG_CACHEDIR}
+${PKGCMD} repo ${PKG_REPODIR}
# Always exit '0', even if pkg(8) complains about conflicts.
exit 0