aboutsummaryrefslogtreecommitdiff
path: root/release/Makefile
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/Makefile
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/Makefile')
-rw-r--r--release/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile
index eb5abc99f407..c2c46de1f4e1 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -224,9 +224,9 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
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/