Date: Fri, 12 Sep 2014 22:20:07 +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: r271491 - head/release/scripts Message-ID: <201409122220.s8CMK7fw094254@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Sep 12 22:20:07 2014 New Revision: 271491 URL: http://svnweb.freebsd.org/changeset/base/271491 Log: 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 Modified: head/release/scripts/pkg-stage.sh Modified: head/release/scripts/pkg-stage.sh ============================================================================== --- head/release/scripts/pkg-stage.sh Fri Sep 12 21:56:57 2014 (r271490) +++ head/release/scripts/pkg-stage.sh Fri Sep 12 22:20:07 2014 (r271491) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409122220.s8CMK7fw094254>