summaryrefslogtreecommitdiff
path: root/release/Makefile
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-01-16 18:33:10 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-01-16 18:33:10 +0000
commite3ff8788aa4381f45f5c39efd99c9cbf1b174b5a (patch)
treefc12a2402db18db44808d73c87c7176a0f807614 /release/Makefile
parent7adac81fc62ba87a2e2db875997c0e233254da83 (diff)
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/release/Makefile b/release/Makefile
index 83c3d1e8507b..4c42f3150882 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -15,6 +15,7 @@
# (by default, the directory above this one)
# PORTSDIR: location of ports tree to distribute (default: /usr/ports)
# DOCDIR: location of doc tree (default: /usr/doc)
+# NOPKG: if set, do not distribute third-party packages
# NOPORTS: if set, do not distribute ports tree
# NOSRC: if set, do not distribute source tree
# NODOC: if set, do not generate release documentation
@@ -214,9 +215,9 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
touch ${.TARGET}
pkg-stage:
-.if(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/