From 017717d87fa81547ee3668df7f14f6cf52cf137a Mon Sep 17 00:00:00 2001 From: Glen Barber Date: Fri, 12 Sep 2014 18:52:01 +0000 Subject: [PATCH] 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 --- release/scripts/pkg-stage.sh | 5 +++-- 1 file 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