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/Makefile | |
| 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/Makefile')
| -rw-r--r-- | release/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile index eb5abc9..c2c46de 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/ |
