32c32
< # $FreeBSD: head/release/release.sh 252101 2013-06-22 22:12:24Z gjb $
---
> # $FreeBSD: head/release/release.sh 252846 2013-07-05 22:04:49Z gjb $
47a48,51
> # Sometimes one needs to checkout src with --force svn option.
> # If custom kernel configs copied to src tree before checkout, e.g.
> SRC_FORCE_CHECKOUT=
>
111a116,134
> # If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
> # is required to build the documentation set.
> if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then
> echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
> echo " and NOPORTS is set."
> NODOC=yes
> fi
>
> # If NOPORTS and/or NODOC are unset, they must not pass to make as variables.
> # The release makefile verifies definedness of NOPORTS/NODOC variables
> # instead of their values.
> DOCPORTS=
> if [ "x${NOPORTS}" != "x" ]; then
> DOCPORTS="NOPORTS=yes "
> fi
> if [ "x${NODOC}" != "x" ]; then
> DOCPORTS="${DOCPORTS}NODOC=yes"
> fi
>
121,123c144,146
< RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=${KERNEL} ${ARCH_FLAGS} ${CONF_FILES}"
< RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=${KERNEL} ${CONF_FILES} \
< NODOC=${NODOC} NOPORTS=${NOPORTS}"
---
> RELEASE_KMAKEFLAGS="${MAKE_FLAGS} ${KERNEL_FLAGS} KERNCONF=\"${KERNEL}\" ${ARCH_FLAGS} ${CONF_FILES}"
> RELEASE_RMAKEFLAGS="${ARCH_FLAGS} KERNCONF=\"${KERNEL}\" ${CONF_FILES} \
> ${DOCPORTS}"
125,130c148,151
< # If PORTS is set and NODOC is unset, force NODOC=yes because the ports tree
< # is required to build the documentation set.
< if [ "x${NOPORTS}" != "x" ] && [ "x${NODOC}" = "x" ]; then
< echo "*** NOTICE: Setting NODOC=1 since ports tree is required"
< echo " and NOPORTS is set."
< NODOC=1
---
> # Force src checkout if configured
> FORCE_SRC_KEY=
> if [ "x${SRC_FORCE_CHECKOUT}" != "x" ]; then
> FORCE_SRC_KEY="--force"
147c168
< svn co ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION
---
> svn co ${FORCE_SRC_KEY} ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION
167,168c188,189
< if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" != "x" ]; then
< PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes BATCH=yes"
---
> if [ -d ${CHROOTDIR}/usr/doc ] && [ "x${NODOC}" = "x" ]; then
> PBUILD_FLAGS="OSVERSION=${_OSVERSION} WITHOUT_JADETEX=yes WITHOUT_X11=yes BATCH=yes"
170c191
< ${PBUILD_FLAGS} install
---
> ${PBUILD_FLAGS} install clean distclean
194,196c215,217
< chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
< chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
< chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
---
> eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_WMAKEFLAGS} buildworld
> eval chroot ${CHROOTDIR} make -C /usr/src ${RELEASE_KMAKEFLAGS} buildkernel
> eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
198c219
< chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \
---
> eval chroot ${CHROOTDIR} make -C /usr/src/release ${RELEASE_RMAKEFLAGS} \