Author: gjb
Date: Fri Mar 7 00:38:29 2014
New Revision: 262879
URL: http://svnweb.freebsd.org/changeset/base/262879
Log:
MFC r260772:
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.
NOTE: WITH_DVD=1 is broken on stable/9, pending updates to the
pkg(7) code. The 'dvdrom' target on stable/9 is broken as-is,
so there is no harm merging this change now. I think.
Sponsored by: The FreeBSD Foundation
Added:
stable/9/release/pkg_repos/
- copied from r260772, head/release/pkg_repos/
Deleted:
stable/9/release/amd64/pkg-stage.conf
stable/9/release/i386/pkg-stage.conf
Modified:
stable/9/release/Makefile
stable/9/release/scripts/pkg-stage.sh
Directory Properties:
stable/9/release/ (props changed)
Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile Fri Mar 7 00:28:11 2014 (r262878)
+++ stable/9/release/Makefile Fri Mar 7 00:38:29 2014 (r262879)
@@ -233,9 +233,9 @@ packagesystem: base.txz kernel.txz ${EXT
touch ${.TARGET}
pkg-stage:
-.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
- sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
- ${REVISION}
+.if !defined(NOPKG)
+ env REPOS_DIR=${.CURDIR}/pkg_repos/ \
+ sh ${.CURDIR}/scripts/pkg-stage.sh
mkdir -p ${.OBJDIR}/dvd/packages/repos/
cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \
${.OBJDIR}/dvd/packages/repos/
Modified: stable/9/release/scripts/pkg-stage.sh
==============================================================================
--- stable/9/release/scripts/pkg-stage.sh Fri Mar 7 00:28:11 2014
(r262878)
+++ stable/9/release/scripts/pkg-stage.sh Fri Mar 7 00:38:29 2014
(r262879)
@@ -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}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
