init.sh/tree.sh: put PATH dirs in xbtmp

e.g. gnupath, xbmkpath

these currently go in XBMK_CACHE/, which is bad
because they're meant to be temporary.

XBMK_CACHE is for permanent files.

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

include/init.sh

@@ -87,7 +87,7 @@ xbmk_set_env()
 
 	xbmk_parent_set_export
 	xbmk_set_version
-	remkdir "$xbtmp" "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath"
+	remkdir "$xbtmp" "$xbtmp/gnupath" "$xbtmp/xbmkpath"
 	xbmk_set_pyver
 }
 
@@ -157,7 +157,7 @@ xbmk_parent_set_export()
 	[ ! -e "$XBMK_CACHE" ] || \
 	    [ -d "$XBMK_CACHE" ] || err "cachedir '$XBMK_CACHE' is a file"; :
 
-	export PATH="$XBMK_CACHE/xbmkpath:$XBMK_CACHE/gnupath:$PATH"
+	export PATH="$xbtmp/xbmkpath:$xbtmp/gnupath:$PATH"
 	xbmkpath="$PATH"
 
 	# if "y": a coreboot target won't be built if target.cfg says release="n"
@@ -207,9 +207,9 @@ xbmk_set_pyver()
 	(
 	# set up python v3.x in PATH, in case it's not set up correctly.
 	# see code above that detected the correct python3 command.
-	x_ cd "$XBMK_CACHE/xbmkpath"
+	x_ cd "$xbtmp/xbmkpath"
 	x_ ln -s "`pybin "$python"`" python
-	) || err "Can't set up python symlink in $XBMK_CACHE/xbmkpath"; :
+	) || err "Can't set up python symlink in $xbtmp/xbmkpath"; :
 }
 
 # Use direct path, to prevent a hang if Python is using a virtual environment,

include/tree.sh

@@ -241,7 +241,7 @@ check_cross_compiler()
 	make -C "$cbdir" $xgccargs || x_ make -C "$cbdir" $xgccargs
 	x_ touch "$xgccfile"
 
-	remkdir "$XBMK_CACHE/gnupath" # reset hostcc
+	remkdir "$xbtmp/gnupath" # reset hostcc
 }
 
 # fix mismatching gcc/gnat versions on debian trixie/sid. as of december 2024,
@@ -269,7 +269,7 @@ check_gnu_path()
 	[ "$gnatfull" = "$gccfull" ] || return 1
 
 	(
-	remkdir "$XBMK_CACHE/gnupath" && x_ cd "$XBMK_CACHE/gnupath"
+	remkdir "$xbtmp/gnupath" && x_ cd "$xbtmp/gnupath"
 	for _gnubin in "$_gnudir/$2"*"-$_gnuver"; do
 		_gnuutil="${_gnubin##*/}" && [ -e "$_gnubin" ] && \
 		    x_ ln -s "$_gnubin" "${_gnuutil%"-$_gnuver"}"