From 4ee12058066780a5f6c689e05aff038058c3dfe2 Mon Sep 17 00:00:00 2001
From: Giuseppe Di Guglielmo <giuseppe@cs.columbia.edu>
Date: Wed, 26 May 2021 14:16:04 -0400
Subject: [PATCH] use local path for temporary directory of toolchains
 installation scripts

- This solves issue #110
---
 utils/toolchain/build_leon3_toolchain.sh      | 14 +++++++++-----
 utils/toolchain/build_riscv32imc_toolchain.sh | 15 +++++++++------
 utils/toolchain/build_riscv_toolchain.sh      | 14 +++++++++-----
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/utils/toolchain/build_leon3_toolchain.sh b/utils/toolchain/build_leon3_toolchain.sh
index 51eba84cb8..881886fd91 100755
--- a/utils/toolchain/build_leon3_toolchain.sh
+++ b/utils/toolchain/build_leon3_toolchain.sh
@@ -12,7 +12,7 @@ export SYSROOT=${ESP_ROOT}/soft/leon3/sysroot
 BUILDROOT_SHA=d6fa6a45e196665d6607b522f290b1451b949c2c
 
 DEFAULT_TARGET_DIR="/opt/leon"
-TMP=/tmp/_leon3_build
+TMP=${ESP_ROOT}/_leon3_build
 
 # Prebuilt from Cobham Gaisler
 SRC_MIRROR="https://espdev.cs.columbia.edu/stuff/leon3"
@@ -103,8 +103,10 @@ fi
 cmd="chown $USER:$(id -gn) ${TARGET_DIR}"
 runsudo ${TARGET_DIR} "$cmd"
 
-# Create temporary folder
-mkdir -p $TMP
+# Remove and create temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+mkdir $TMP
 cd $TMP
 
 # Bare-metal compiler
@@ -246,6 +248,10 @@ if [ $(noyes "Skip buildroot?") == "n" ]; then
     cd $TMP
 fi
 
+# Remove temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+
 #Leon
 echo ""
 echo ""
@@ -253,7 +259,5 @@ echo "=== Use the following to load LEON environment ==="
 echo -n "  export PATH=${LEON}/bin:"; echo '$PATH'
 echo ""
 
-cd $CURRENT_DIR
-
 echo "*** Successfully installed LEON toolchain to $TARGET_DIR ***"
 
diff --git a/utils/toolchain/build_riscv32imc_toolchain.sh b/utils/toolchain/build_riscv32imc_toolchain.sh
index b9b0c8377d..b9967952a9 100755
--- a/utils/toolchain/build_riscv32imc_toolchain.sh
+++ b/utils/toolchain/build_riscv32imc_toolchain.sh
@@ -10,7 +10,7 @@ ESP_ROOT=$(realpath ${SCRIPT_PATH}/../..)
 RISCV_GNU_TOOLCHAIN_SHA=afcc8bc655d30cf6af054ac1d3f5f89d0627aa79
 
 DEFAULT_TARGET_DIR="/opt/riscv32imc"
-TMP=/tmp/_riscv32imc_build
+TMP=${ESP_ROOT}/_riscv32imc_build
 
 # Helper functions
 yesno () {
@@ -80,8 +80,10 @@ if test ! -e ${TARGET_DIR}; then
     runsudo $pdir "$cmd"
 fi
 
-# Create temporary folder
-mkdir -p $TMP
+# Remove and create temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+mkdir $TMP
 cd $TMP
 
 # Bare-metal compiler
@@ -103,9 +105,12 @@ if [ $(noyes "Skip ${src}") == "n" ]; then
     runsudo ${TARGET_DIR} "$cmd"
 
 fi
-cd $TMP
 
 
+# Remove temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+
 #Riscv
 echo ""
 echo ""
@@ -114,6 +119,4 @@ echo -n "  export PATH=${RISCV}/bin:"; echo '$PATH'
 echo "  export RISCV=${RISCV}"
 echo ""
 
-cd $CURRENT_DIR
-
 echo "*** Successfully installed RISC-V (rv32imc) toolchain to $TARGET_DIR ***"
diff --git a/utils/toolchain/build_riscv_toolchain.sh b/utils/toolchain/build_riscv_toolchain.sh
index 36a813f03b..9a4f3c45a7 100755
--- a/utils/toolchain/build_riscv_toolchain.sh
+++ b/utils/toolchain/build_riscv_toolchain.sh
@@ -14,7 +14,7 @@ RISCV_GNU_TOOLCHAIN_SHA=afcc8bc655d30cf6af054ac1d3f5f89d0627aa79
 BUILDROOT_SHA=d6fa6a45e196665d6607b522f290b1451b949c2c
 
 DEFAULT_TARGET_DIR="/opt/riscv"
-TMP=/tmp/_riscv_build
+TMP=${ESP_ROOT}/_riscv_build
 
 # Helper functions
 yesno () {
@@ -93,8 +93,10 @@ if test ! -e ${TARGET_DIR}; then
     runsudo $pdir "$cmd"
 fi
 
-# Create temporary folder
-mkdir -p $TMP
+# Remove and create temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+mkdir $TMP
 cd $TMP
 
 # Bare-metal compiler
@@ -175,6 +177,10 @@ if [ $(noyes "Skip buildroot?") == "n" ]; then
     cd $TMP
 fi
 
+# Remove temporary folder
+cmd="rm -rf $TMP"
+runsudo ${TARGET_DIR} "$cmd"
+
 #Riscv
 echo ""
 echo ""
@@ -183,6 +189,4 @@ echo -n "  export PATH=${RISCV}/bin:"; echo '$PATH'
 echo "  export RISCV=${RISCV}"
 echo ""
 
-cd $CURRENT_DIR
-
 echo "*** Successfully installed RISC-V toolchain to $TARGET_DIR ***"