diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-01-16 18:33:10 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-01-16 18:33:10 +0000 |
| commit | e3ff8788aa4381f45f5c39efd99c9cbf1b174b5a (patch) | |
| tree | fc12a2402db18db44808d73c87c7176a0f807614 /release/amd64/pkg-stage.conf | |
| parent | 7adac81fc62ba87a2e2db875997c0e233254da83 (diff) | |
MFreleng10 r259582 (reverse), MFstable10 r259491, r259492, r260781:upstream/10.0.0release/10.0.0
r259582 (reverted):
Set PACKAGESITE to 'release/0' for the pkg-stage target to pull
the release set of packages. (Required to eliminate conflicts.)
r259491:
Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.
r259492:
Add NOPKG to disable pkg-stage.
r260781:
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.
A change local to releng/10.0 sets the package fetch URL to
'release/0'.
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/amd64/pkg-stage.conf')
| -rwxr-xr-x | release/amd64/pkg-stage.conf | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/release/amd64/pkg-stage.conf b/release/amd64/pkg-stage.conf deleted file mode 100755 index 92ad85f42939..000000000000 --- a/release/amd64/pkg-stage.conf +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -export PKG_ABI="freebsd:${REVISION%.[0-9]*}:x86:64" -export ASSUME_ALWAYS_YES=1 -export __PKG_CONF="/etc/pkg/FreeBSD.conf" -export PACKAGESITE="http://pkg.FreeBSD.org/${PKG_ABI}/release/0" -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" |