Deleted Added
full compact
32c32
< # $FreeBSD: head/release/release.sh 252846 2013-07-05 22:04:49Z gjb $
---
> # $FreeBSD: head/release/release.sh 254293 2013-08-13 20:16:14Z gjb $
44,46c44,46
< SRCBRANCH="base/head"
< DOCBRANCH="doc/head"
< PORTBRANCH="ports/head"
---
> SRCBRANCH="base/head@rHEAD"
> DOCBRANCH="doc/head@rHEAD"
> PORTBRANCH="ports/head@rHEAD"
52,56d51
< # The default src/, doc/, and ports/ revisions.
< SRCREVISION="-rHEAD"
< DOCREVISION="-rHEAD"
< PORTREVISION="-rHEAD"
<
65,66c60,64
< WORLD_FLAGS="-j$(sysctl -n hw.ncpu)"
< KERNEL_FLAGS="-j$(expr $(sysctl -n hw.ncpu) / 2)"
---
> NCPU=$(sysctl -n hw.ncpu)
> if [ ${NCPU} -gt 1 ]; then
> WORLD_FLAGS="-j${NCPU}"
> KERNEL_FLAGS="-j$(expr ${NCPU} / 2)"
> fi
72,75d69
< # The TARGET and TARGET_ARCH to build, defaults to the running system.
< TARGET="$(uname -p)"
< TARGET_ARCH="${TARGET}"
<
139c133,137
< ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
---
> if [ "x${TARGET}" != "x" ] && [ "x${TARGET_ARCH}" != "x" ]; then
> ARCH_FLAGS="TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH}"
> else
> ARCH_FLAGS=
> fi
168c166
< svn co ${FORCE_SRC_KEY} ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src $SRCREVISION
---
> svn co ${FORCE_SRC_KEY} ${SVNROOT}/${SRCBRANCH} ${CHROOTDIR}/usr/src
170c168
< svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc $DOCREVISION
---
> svn co ${SVNROOT}/${DOCBRANCH} ${CHROOTDIR}/usr/doc
173c171
< svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports $PORTREVISION
---
> svn co ${SVNROOT}/${PORTBRANCH} ${CHROOTDIR}/usr/ports