diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-10 00:35:33 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-10 00:35:33 +0000 |
| commit | fca381ba6d6ae08a30c773d35a525952279845ba (patch) | |
| tree | 5d85574061b9b77db9007ab1eb0a59df599fca36 /release | |
| parent | 7777b8aff60370821aa528324b06e22a4d66aa98 (diff) | |
| download | FreeBSD-src-fca381ba6d6ae08a30c773d35a525952279845ba.zip FreeBSD-src-fca381ba6d6ae08a30c773d35a525952279845ba.tar.gz | |
MFC r259079:
Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually
passed to 'make release'.
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
| -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 5f30b4b..882f911 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 9186c05..f31c87a 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= |
