Date: Mon, 19 Oct 2015 18:29:17 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r289599 - user/gjb/thermite Message-ID: <201510191829.t9JITH7n092028@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Mon Oct 19 18:29:17 2015 New Revision: 289599 URL: https://svnweb.freebsd.org/changeset/base/289599 Log: Re-sync with releng repo: - Drop support for 9.x snapshot builds. - Remove explicit 'make ${MAKE}', which was needed to help the toolchain figure out what version of make(1) to build. Sponsored by: The FreeBSD Foundation Modified: user/gjb/thermite/thermite.sh Modified: user/gjb/thermite/thermite.sh ============================================================================== --- user/gjb/thermite/thermite.sh Mon Oct 19 18:06:35 2015 (r289598) +++ user/gjb/thermite/thermite.sh Mon Oct 19 18:29:17 2015 (r289599) @@ -480,18 +480,10 @@ install_chroots() { # Build amd64/i386 "seed" chroots for all branches being built. build_chroots() { source_config || return 0 - if [ ${rev} -le 8 ]; then + if [ ${rev} -le 9 ]; then info "This script does not support rev ${rev}" return 0 fi - # Building stable/9 on head/ is particularly race-prone when - # building make(1) for the first time. I have no idea why. - # Apply duct tape for now. - if [ ${rev} -lt 10 ]; then - __makecmd="make" - else - __makecmd="bmake" - fi case ${arch} in i386) _chrootarch="i386" @@ -514,13 +506,6 @@ build_chroots() { ${_srcdir} \ >> ${logdir}/${_build}.log 2>&1 fi - info "Building ${_srcdir} make(1)" - env MAKEOBJDIRPREFIX=${_objdir} \ - make -C ${_srcdir} ${WORLD_FLAGS} \ - __MAKE_CONF=/dev/null SRCCONF=/dev/null \ - TARGET=${_chrootarch} TARGET_ARCH=${_chrootarch} \ - ${__makecmd} >> \ - ${logdir}/${_build}.log 2>&1 info "Building ${_srcdir} world" env MAKEOBJDIRPREFIX=${_objdir} \ make -C ${_srcdir} ${WORLD_FLAGS} \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510191829.t9JITH7n092028>