aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-01-16 16:12:09 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-01-16 16:12:09 +0000
commit6f50c4ea7197d6ce64046c058add21f30324482a (patch)
tree019dcbce72e570d3c9b754409132650b3cfbfb86 /release/scripts
parent5f171f64a2d616ec0f408fe91844cbe31e794d72 (diff)
downloadsrc-6f50c4ea7197d6ce64046c058add21f30324482a.tar.gz
src-6f50c4ea7197d6ce64046c058add21f30324482a.zip
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
Notes
Notes: svn path=/head/; revision=260772
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/pkg-stage.sh48
1 files changed, 30 insertions, 18 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index 3781f776656a..2281435aff45 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -5,24 +5,31 @@
set -e
-usage() {
- echo "$(basename ${0}) /path/to/pkg-stage.conf revision"
- exit 1
-}
-
-if [ ! -e "${1}" ]; then
- echo "Configuration file not specified."
- echo
- usage
-fi
-
-if [ "$#" -lt 2 ]; then
- usage
-fi
-
-# Source config file for this architecture.
-REVISION="${2}"
-. "${1}" || exit 1
+export ASSUME_ALWAYS_YES=1
+export PKG_DBDIR="/tmp/pkg"
+export PERMISSIVE="YES"
+export REPO_AUTOUPDATE="NO"
+export PKGCMD="/usr/sbin/pkg -d"
+
+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/portmaster
+shells/bash
+shells/zsh
+security/sudo
+sysutils/screen
+www/firefox
+www/links
+x11-drivers/xf86-video-vmware
+x11/gnome2
+x11/kde4
+x11/xorg"
# If NOPORTS is set for the release, do not attempt to build pkg(8).
if [ ! -f /usr/ports/Makefile ]; then
@@ -33,8 +40,13 @@ if [ ! -x /usr/local/sbin/pkg ]; then
/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
fi
+export PKG_ABI=$(pkg -vv | grep ^ABI | awk '{print $3}')
+export PKG_CACHEDIR="dvd/packages/${PKG_ABI}"
+
/bin/mkdir -p ${PKG_CACHEDIR}
+# Print pkg(8) information to make debugging easier.
+${PKGCMD} -vv
${PKGCMD} update -f
${PKGCMD} fetch -d ${DVD_PACKAGES}