diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2013-12-07 19:39:38 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2013-12-07 19:39:38 +0000 |
| commit | 1d75f17448def07137de5fc02a0145b753426a7f (patch) | |
| tree | ffa3cf556a07b369ba365ec595cee06ba1558158 | |
| parent | 6cd2b1dc63d9d151e142460ef34f9ca2295de77e (diff) | |
| download | src-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
| -rw-r--r-- | release/release.conf.sample | 1 | ||||
| -rwxr-xr-x | release/release.sh | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/release/release.conf.sample b/release/release.conf.sample index 5f30b4b9e383..882f911b31fd 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD" #NODOC= #NOPORTS= #RELSTRING= +#WITH_DVD= 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= |