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/inject.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/inject.sh') diff --git a/include/inject.sh b/include/inject.sh index fa46ee94..77d99874 100644 --- a/include/inject.sh +++ b/include/inject.sh @@ -117,21 +117,21 @@ scankconfig() modify_mac() { - x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$xbloc/gbe" + x_ cp "${CONFIG_GBE_BIN_PATH##*../}" "$xbtmp/gbe" [ -n "$new_mac" ] && [ "$new_mac" != "restore" ] && \ x_ make -C util/nvmutil clean && x_ make -C util/nvmutil && \ - x_ "$nvm" "$xbloc/gbe" setmac "$new_mac" + x_ "$nvm" "$xbtmp/gbe" setmac "$new_mac" fx_ newmac x_ find "$tmpromdir" -maxdepth 1 -type f -name "*.rom" printf "\nThe following GbE NVM data will be written:\n" - x_ "$nvm" "$xbloc/gbe" dump | grep -v "bytes read from file" || : + x_ "$nvm" "$xbtmp/gbe" dump | grep -v "bytes read from file" || : } newmac() { e "$1" f && xchanged="y" && x_ \ - "$ifdtool" $ifdprefix -i GbE:"$xbloc/gbe" "$1" -O "$1"; : + "$ifdtool" $ifdprefix -i GbE:"$xbtmp/gbe" "$1" -O "$1"; : } remktar() -- cgit v1.2.1