Remove the entire objdir tree to avoid picking up stale binaries from

prior builds. Move GELI to building first.

Sponsored by: Netflix

tools/boot/universe.sh

@@ -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 \
@@ -74,12 +86,3 @@ for i in \
     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