diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-07 19:39:38 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-07 19:39:38 +0000 |
| commit | e5fc4e1ef1326d341674e2b46e9c6d61777b4d24 (patch) | |
| tree | ffa3cf556a07b369ba365ec595cee06ba1558158 /release/release.sh | |
| parent | ab7bbad691c7c6a1dff5695bee95cc25cff114ce (diff) | |
| download | FreeBSD-src-e5fc4e1ef1326d341674e2b46e9c6d61777b4d24.zip FreeBSD-src-e5fc4e1ef1326d341674e2b46e9c6d61777b4d24.tar.gz | |
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
Diffstat (limited to 'release/release.sh')
| -rwxr-xr-x | release/release.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/release/release.sh b/release/release.sh index 8db84d7..1389ce3 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= |
