From f855e954637cc07479f11a129f794e4268ee99ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Si=C3=A2n=20James?= <sian.james@amd.com>
Date: Fri, 4 Oct 2024 13:59:12 +0100
Subject: [PATCH] ON-16094: Ensure complete tmp dir is cleaned up at end of
 build

---
 scripts/zf_mkdist | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/zf_mkdist b/scripts/zf_mkdist
index 88e09f3..105114b 100755
--- a/scripts/zf_mkdist
+++ b/scripts/zf_mkdist
@@ -58,10 +58,10 @@ copy_files_to_tmpdir() {
 
 
 grab_artifacts_from_tmpdir() {
-    tmpdir="${zf_tmpdir}/build/artifacts"
+    artifact_tmpdir="${zf_tmpdir}/build/artifacts"
     local_dir="${top_dir}/build/artifacts"
     mkdir -p "${local_dir}"
-    tar cz -C "${tmpdir}" . | tar zx -C "${local_dir}"
+    tar cz -C "${artifact_tmpdir}" . | tar zx -C "${local_dir}"
 }
 
 make_release_package() {
@@ -198,7 +198,7 @@ if $shim && [ -z "$onload_tarball" ]; then
   usage;
 fi
 
-tmpdir=$(mktemp -d)
+declare -r tmpdir=$(mktemp -d)
 onload_tmpdir="${tmpdir}/onload"
 zf_tmpdir="${tmpdir}/zf"
 trap cleanup EXIT