aboutsummaryrefslogtreecommitdiff
path: root/release/release.sh
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2013-12-07 19:39:38 +0000
committerGlen Barber <gjb@FreeBSD.org>2013-12-07 19:39:38 +0000
commit1d75f17448def07137de5fc02a0145b753426a7f (patch)
treeffa3cf556a07b369ba365ec595cee06ba1558158 /release/release.sh
parent6cd2b1dc63d9d151e142460ef34f9ca2295de77e (diff)
downloadsrc-1d75f17448def07137de5fc02a0145b753426a7f.tar.gz
src-1d75f17448def07137de5fc02a0145b753426a7f.zip
Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually
passed to 'make release'. MFC after: 3 days X-Before-RC2: yes Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=259079
Diffstat (limited to 'release/release.sh')
-rwxr-xr-xrelease/release.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh
index 8db84d7aee06..1389ce341e33 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -72,6 +72,9 @@ KERNEL="GENERIC"
NODOC=
NOPORTS=
+# Set to non-empty value to build dvd1.iso as part of the release.
+WITH_DVD=
+
usage() {
echo "Usage: $0 [-c release.conf]"
exit 1
@@ -129,7 +132,7 @@ CHROOT_DMAKEFLAGS="${CONF_FILES}"
RELEASE_WMAKEFLAGS="${MAKE_FLAGS} ${WORLD_FLAGS} ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
- ${DOCPORTS}"
+ ${DOCPORTS} WITH_DVD=${WITH_DVD}"
# Force src checkout if configured
FORCE_SRC_KEY=