mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-12 14:32:42 +02:00
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>
This commit is contained in:
+4
-4
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user