Date: Tue, 10 Dec 2013 00:35:34 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259151 - stable/10/release Message-ID: <201312100035.rBA0ZY51066422@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Dec 10 00:35:33 2013 New Revision: 259151 URL: http://svnweb.freebsd.org/changeset/base/259151 Log: MFC r259079: Add WITH_DVD to RELEASE_RMAKEFLAGS, otherwise it is not actually passed to 'make release'. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/release.conf.sample stable/10/release/release.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/release.conf.sample ============================================================================== --- stable/10/release/release.conf.sample Tue Dec 10 00:07:04 2013 (r259150) +++ stable/10/release/release.conf.sample Tue Dec 10 00:35:33 2013 (r259151) @@ -39,3 +39,4 @@ PORTBRANCH="ports/head@rHEAD" #NODOC= #NOPORTS= #RELSTRING= +#WITH_DVD= Modified: stable/10/release/release.sh ============================================================================== --- stable/10/release/release.sh Tue Dec 10 00:07:04 2013 (r259150) +++ stable/10/release/release.sh Tue Dec 10 00:35:33 2013 (r259151) @@ -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=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312100035.rBA0ZY51066422>