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/vendor.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'include/vendor.sh') diff --git a/include/vendor.sh b/include/vendor.sh index b04602c1..6e379236 100644 --- a/include/vendor.sh +++ b/include/vendor.sh @@ -145,9 +145,9 @@ extract_intel_me() { e "$mecleaner" f not && err "$cbdir: me_cleaner missing" - _7ztest="$xbloc/metmp/a" - _metmp="$xbloc/me.bin" - x_ rm -f "$_metmp" "$xbloc/a" + _7ztest="$xbtmp/metmp/a" + _metmp="$xbtmp/me.bin" + x_ rm -f "$_metmp" "$xbtmp/a" mfs="" if [ "$ME11bootguard" = "y" ]; then @@ -176,7 +176,7 @@ find_me() _7ztest="${_7ztest}a" && _r="-r" && [ -n "$mfs" ] && _r="" - "$mecleaner" $mfs $_r -t -O "$xbloc/a" -M "$_metmp" "$1" || \ + "$mecleaner" $mfs $_r -t -O "$xbtmp/a" -M "$_metmp" "$1" || \ "$mecleaner" $mfs $_r -t -O "$_metmp" "$1" || "$me7updateparser" \ -O "$_metmp" "$1" || extract_archive "$1" "$_7ztest" || return 0 @@ -386,9 +386,9 @@ vfile() elif [ "$nuke" = "nuke" ]; then x_ "$cbfstool" "$rom" remove -n "$cbfsname" elif [ "$_t" = "stage" ]; then # the only stage we handle is refcode - x_ rm -f "$xbloc/refcode" - x_ "$rmodtool" -i "$_dest" -o "$xbloc/refcode" - x_ "$cbfstool" "$rom" add-stage -f "$xbloc/refcode" \ + x_ rm -f "$xbtmp/refcode" + x_ "$rmodtool" -i "$_dest" -o "$xbtmp/refcode" + x_ "$cbfstool" "$rom" add-stage -f "$xbtmp/refcode" \ -n "$cbfsname" -t stage else x_ "$cbfstool" "$rom" add -f "$_dest" -n "$cbfsname" \ -- cgit v1.2.1