lbmk: minor cleanup

Signed-off-by: Leah Rowe <leah@libreboot.org>

include/git.sh

@@ -61,9 +61,8 @@ git_prep()
 
 	[ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \
 	    [ "$xtree" != "$tree" ] && link_crossgcc "$_loc"
-	[ "$XBMK_RELEASE" = "y" ] && \
+	[ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \
-	    [ "$_loc" != "$XBMK_CACHE/repo/$project" ] && \
+	    [ "$XBMK_RELEASE" = "y" ] && rmgit "$tmpgit"
-	    rmgit "$tmpgit"
 
 	move_repo "$_loc"
 }
@@ -77,9 +76,8 @@ prep_submodules()
 
 fetch_submodule()
 {
-	mcfgdir="$mdir/${1##*/}"
+	mcfgdir="$mdir/${1##*/}"; eval \
-	eval "`setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup \
+	    "`setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st`"
-	    st`"
 	[ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \
 	    $err "! . $mcfgdir/module.cfg"
 

include/rom.sh

@@ -283,6 +283,7 @@ mkcoreboottar()
 	[ "$target" = "$tree" ] && return 0
 	[ "$XBMK_RELEASE" = "y" ] || return 0
 	[ "$release" != "n" ] || return 0
+
 	$dry mkrom_tarball "bin/$target"
 	$dry x_ ./mk inject "bin/${relname}_${target}.tar.xz" nuke; :
 }

include/vendor.sh

@@ -160,7 +160,6 @@ extract_intel_me()
 extract_intel_me_bruteforce()
 {
 	[ $# -gt 0 ] && cdir="$1"
-
 	e "$_metmp" f && return 0
 
 	[ -z "$sdir" ] && sdir="$(mktemp -d)"
@@ -537,8 +536,8 @@ process_release_rom()
 
 		expr "X$xromsize" : "X-\{0,1\}[0123456789][0123456789]*$" \
 		    1>/dev/null 2>/dev/null || $err "$_xrom size non-integer"
-		[ $xromsize -lt 2 ] && $err \
+		[ $xromsize -lt 2 ] && \
-		    "$_xrom: Will not create empty file. $dontflash"
+		    $err "$_xrom: Will not create empty file. $dontflash"
 
 		xromsize="`expr $xromsize - 1`"
 		[ $xromsize -lt 524288 ] && \

mk

@@ -86,6 +86,7 @@ build_release()
 {
 	(
 	cd "$srcdir" || $err "$vdir: !cd \"$srcdir\""
+
 	./mk -f
 	x_ rm -Rf tmp
 	rmgit .
@@ -206,9 +207,11 @@ build_targets()
 		export PATH="$xbmkpath"
 		[ "$x" = "list" ] && x_ ls -1 "config/$project" && \
 		    listfile="" && break
+
 		target="$x"
 		printf "'make %s', '%s', '%s'\n" "$mode" "$project" "$target"
 		x_ handle_defconfig
+
 		mkhelp "$postmake"
 	done; :
 }
@@ -348,8 +351,7 @@ check_cross_compiler()
 		    x_ make -C "$cbdir" crossgcc-$xfix $xgccargs
 
 		# we only want to mess with hostcc to build xgcc
-		rm -f "$XBMK_CACHE/gnupath/"* || \
+		rm -f "$XBMK_CACHE/gnupath/"* || $err "Can't clear gnupath/"; :
-		    $err "Cannot clear gnupath/"; :
 	done; :
 }
 
@@ -425,6 +427,7 @@ elfcheck()
 handle_makefile()
 {
 	$dry check_makefile "$srcdir" && x_ make -C "$srcdir" $cleanargs clean
+
 	[ -f "$defconfig" ] && x_ cp "$defconfig" "$srcdir/.config"
 	[ -n "$mode" ] || [ -n "$btype" ] || $dry make -C \
 	    "$srcdir" silentoldconfig || make -C "$srcdir" oldconfig || :
@@ -443,6 +446,7 @@ handle_makefile()
 run_make_command()
 {
 	mkhelp "$premake"
+
 	$dry check_cmake "$srcdir" && [ -z "$mode" ] && \
 	    $dry check_autoconf "$srcdir"
 	$dry check_makefile "$srcdir" || return 1