Date: Mon, 4 Dec 2017 01:14:17 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326505 - head/tools/boot Message-ID: <201712040114.vB41EHAD078402@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Mon Dec 4 01:14:17 2017 New Revision: 326505 URL: https://svnweb.freebsd.org/changeset/base/326505 Log: Remove the entire objdir tree to avoid picking up stale binaries from prior builds. Move GELI to building first. Sponsored by: Netflix Modified: head/tools/boot/universe.sh Modified: head/tools/boot/universe.sh ============================================================================== --- head/tools/boot/universe.sh Mon Dec 4 01:14:12 2017 (r326504) +++ head/tools/boot/universe.sh Mon Dec 4 01:14:17 2017 (r326505) @@ -26,6 +26,8 @@ dobuild() local opt=$3 echo -n "Building $ta ${opt} ... " + objdir=$(make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make -V .OBJDIR") + rm -rf ${objdir} if ! make buildenv TARGET_ARCH=$ta BUILDENV_SHELL="make clean cleandepend cleandir obj depend" \ > $lf 2>&1; then echo "Fail (cleanup)" @@ -42,6 +44,16 @@ dobuild() top=$(make -V SRCTOP) cd $top/stand + +# Build without GELI +for i in \ + amd64/amd64 \ + i386/i386 \ + ; do + ta=${i##*/} + dobuild $ta _.boot.${ta}.no_geli.log "WITHOUT_LOADER_GEIL=yes" +done + # Default build for a goodly selection of architectures for i in \ amd64/amd64 \ @@ -73,13 +85,4 @@ for i in \ ; do ta=${i##*/} dobuild $ta _.boot.${ta}.firewire.log "MK_LOADER_FIREWIRE=yes" -done - -# Build without GELI -for i in \ - amd64/amd64 \ - i386/i386 \ - ; do - ta=${i##*/} - dobuild $ta _.boot.${ta}.no_geli.log "MK_LOADER_GELI=no" done
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712040114.vB41EHAD078402>