diff options
| author | gjb <gjb@FreeBSD.org> | 2014-09-12 18:52:01 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-09-12 18:52:01 +0000 |
| commit | 16a7ea6373cbed61b6bbd51c3846a569f2b91109 (patch) | |
| tree | f334f81f7548b1c9d363ab36099c3c4b51dcdcec /release | |
| parent | b1ae8069caa60cfb78f593f7e2dc4c1a85f6f4ba (diff) | |
| download | FreeBSD-src-16a7ea6373cbed61b6bbd51c3846a569f2b91109.zip FreeBSD-src-16a7ea6373cbed61b6bbd51c3846a569f2b91109.tar.gz | |
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
Diffstat (limited to 'release')
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6d02ac6..d43bf0a 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 |
