Date: Fri, 12 Sep 2014 18:52:01 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r271480 - head/release/scripts Message-ID: <201409121852.s8CIq1Eg099609@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Sep 12 18:52:01 2014 New Revision: 271480 URL: http://svnweb.freebsd.org/changeset/base/271480 Log: 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 Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh ============================================================================== --- head/release/scripts/pkg-stage.sh Fri Sep 12 18:31:44 2014 (r271479) +++ head/release/scripts/pkg-stage.sh Fri Sep 12 18:52:01 2014 (r271480) @@ -44,7 +44,8 @@ PKG_ABI=$(pkg -vv | grep ^ABI | awk '{pr 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409121852.s8CIq1Eg099609>