diff options
| author | gjb <gjb@FreeBSD.org> | 2014-09-12 22:20:07 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2014-09-12 22:20:07 +0000 |
| commit | 59fee6caf1f5c4be4c57cebb3b4c69af28bc2f00 (patch) | |
| tree | a18774c49b805f42e4b4952018b49d42ad0163ea /release/scripts | |
| parent | ee3fde22134502fe2fbbb1d39280f65da4c4eb51 (diff) | |
| download | FreeBSD-src-59fee6caf1f5c4be4c57cebb3b4c69af28bc2f00.zip FreeBSD-src-59fee6caf1f5c4be4c57cebb3b4c69af28bc2f00.tar.gz | |
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
Diffstat (limited to 'release/scripts')
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 0204d8c..4a1ba19 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -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} |
