diff options
author | gjb <gjb@FreeBSD.org> | 2014-01-16 16:12:09 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2014-01-16 16:12:09 +0000 |
commit | 284a0c8006f802fc42ba227ed8563e8f9c2006ff (patch) | |
tree | 019dcbce72e570d3c9b754409132650b3cfbfb86 /release/i386 | |
parent | 0d4d14c84bf3afff3dabf8bfd5c92310a76f0c89 (diff) | |
download | FreeBSD-src-284a0c8006f802fc42ba227ed8563e8f9c2006ff.zip FreeBSD-src-284a0c8006f802fc42ba227ed8563e8f9c2006ff.tar.gz |
Update the pkg-stage target to be more compatible with pkg-1.2:
- Add a release-dvd.conf pkg(8) configuration file to override
the default FreeBSD.conf configuration.
- Remove architecture-specific pkg-stage.conf files, consolidate,
and move their contents to scripts/pkg-stage.sh.
- Use 'pkg -vv' to determine the ABI, which is used as the
cache directory.
Prior to these changes, it would be possible for pkg-stage to fetch
conflicting binary packages from multiple repositories.
Tested against: head@r260522, stable/10@r260522
MFC after: 3 days
X-Insta-MFC: possibly
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/i386')
-rwxr-xr-x | release/i386/pkg-stage.conf | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/release/i386/pkg-stage.conf b/release/i386/pkg-stage.conf deleted file mode 100755 index 6d9e8ef..0000000 --- a/release/i386/pkg-stage.conf +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:32" -export ASSUME_ALWAYS_YES=1 -export __PKG_CONF="/etc/pkg/FreeBSD.conf" -export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/latest" -export MIRROR_TYPE="SRV" -export REPO_AUTOUPDATE="NO" -export PKG_DBDIR="/tmp/pkg" -export PKG_CACHEDIR="dvd/packages/${PKG_ABI}" -export PERMISSIVE="YES" -export PKGCMD="/usr/sbin/pkg -d -C ${__PKG_CONF}" - -DVD_PACKAGES="archivers/unzip -devel/subversion -devel/subversion-static -emulators/linux_base-f10 -misc/freebsd-doc-all -net/mpd5 -net/rsync -ports-mgmt/pkg -ports-mgmt/portaudit -ports-mgmt/portmaster -shells/bash -shells/zsh -security/sudo -sysutils/screen -www/firefox -www/links -x11-drivers/xf86-video-vmware -x11/gnome2 -x11/kde4 -x11/xorg" |