From 0d107ad872b1eb87dcd46e8dc66963696ad08d82 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 2 Sep 2025 06:08:57 +0100 Subject: xbmk: remove xbloc, re-use xbtmp instead we no longer separate them. xbloc was the on-disk tmp directory, whereas xbtmp used to be in /tmp which we assumed to be tmpfs (it may not be, but often is on many workstation setups - and our documentation recommended doing this). as mentioned in the previous commit, benchmarking shows little speed difference using tmpfs /tmp versus on-disk /tmp, for our purposes at least. therefore, the handling of tmp files is being greatly simplified. Signed-off-by: Leah Rowe --- include/init.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'include/init.sh') diff --git a/include/init.sh b/include/init.sh index aabdd5d4..03c45c1a 100644 --- a/include/init.sh +++ b/include/init.sh @@ -14,13 +14,12 @@ projectsite="https://libreboot.org/" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games" eval "`setvars "" _nogit board reinstall versiondate aur_notice configdir \ - datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbloc \ - xbmklock cvxbmk cvchk xbmkpath is_child basetmp`" + datadir version xbmkpwd relname xbmkpwd xbtmp python pyver xbmklock \ + cvxbmk cvchk xbmkpath is_child basetmp`" xbmk_init() { xbmkpwd="`pwd`" || err "Cannot generate PWD" - xbloc="$xbmkpwd/tmp" xbmklock="$xbmkpwd/lock" basetmp="$xbmkpwd/xbmkwd" @@ -86,7 +85,7 @@ xbmk_set_env() xbmk_parent_set_export xbmk_set_version - remkdir "$xbtmp" "$xbloc" "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" + remkdir "$xbtmp" "$XBMK_CACHE/gnupath" "$XBMK_CACHE/xbmkpath" xbmk_set_pyver } @@ -265,7 +264,7 @@ xbmk_child_exec() { xbmk_rval=0 ( x_ ./mk "$@" ) || xbmk_rval=1 - ( x_ rm -Rf "$xbloc" "$xbtmp" ) || xbmk_rval=1 + ( x_ rm -Rf "$xbtmp" ) || xbmk_rval=1 ( x_ rm -f "$xbmklock" ) || xbmk_rval=1 exit $xbmk_rval } -- cgit v1.2.1