From dfeaf7fd229921615c8cc202aadd568024429fa4 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Sun, 8 Sep 2024 14:18:21 -0700
Subject: [PATCH] Fix tar

---
 bin/wally-tool-chain-install.sh | 83 ++++++++++++++-------------------
 1 file changed, 36 insertions(+), 47 deletions(-)

diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index 12049b8ce..b524450c7 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -7,6 +7,7 @@
 ## Modified: 22 January 2023
 ## Modified: 23 March 2023
 ## Modified: 30 June 2024, Jordan Carlin jcarlin@hmc.edu
+## Modified: 1 September 2024
 ##
 ## Purpose: Open source tool chain installation script
 ##
@@ -153,24 +154,24 @@ echo -e "${SUCCESS_COLOR}Python environment successfully configured!${ENDC}"
 
 
 # Extra dependecies needed for older distros that don't have new enough versions available from package manager
-#if (( RHEL_VERSION == 8 )) || (( UBUNTU_VERSION == 20 )); then
-    # Newer versin of glib required for QEMU.
-    # Anything newer than this won't build on red hat 8
-   # STATUS="glib"
-  #  if [ ! -e "$RISCV"/include/glib-2.0 ]; then
-    #    section_header "Installing glib"
-    #    pip install -U meson # Meson is needed to build glib
-  #      cd "$RISCV"
-    #    curl --location https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz | tar xJz
-      #  cd glib-2.70.5
-     #   meson setup _build --prefix="$RISCV"
-    #    meson compile -C _build
-   #     meson install -C _build
-     #   cd "$RISCV"
-    #    rm -rf glib-2.70.5
-       # echo -e "${SUCCESS_COLOR}glib successfully installed!${ENDC}"
-   # fi
-#fi
+# if (( RHEL_VERSION == 8 )) || (( UBUNTU_VERSION == 20 )); then
+#     #  Newer versin of glib required for QEMU.
+#     #  Anything newer than this won't build on red hat 8
+#     STATUS="glib"
+#     if [ ! -e "$RISCV"/include/glib-2.0 ]; then
+#         section_header "Installing glib"
+#         pip install -U meson # Meson is needed to build glib
+#         cd "$RISCV"
+#         curl --location https://download.gnome.org/sources/glib/2.70/glib-2.70.5.tar.xz | tar xJ
+#         cd glib-2.70.5
+#         meson setup _build --prefix="$RISCV"
+#         meson compile -C _build
+#         meson install -C _build
+#         cd "$RISCV"
+#         rm -rf glib-2.70.5
+#         echo -e "${SUCCESS_COLOR}glib successfully installed!${ENDC}"
+#     fi
+# fi
 
 # Newer version of gmp needed for sail-riscv model
 if (( RHEL_VERSION == 8 )); then
@@ -178,7 +179,7 @@ if (( RHEL_VERSION == 8 )); then
     if [ ! -e "$RISCV"/include/gmp.h ]; then
         section_header "Installing gmp"
         cd "$RISCV"
-        curl --location https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz | tar xJz
+        curl --location https://ftp.gnu.org/gnu/gmp/gmp-6.3.0.tar.xz | tar xJ
         cd gmp-6.3.0
         ./configure --prefix="$RISCV"
         make -j "${NUM_THREADS}"
@@ -244,24 +245,24 @@ fi
 
 # QEMU (https://www.qemu.org/docs/master/system/target-riscv.html)
 # QEMU is an open source machine emulator and virtualizer capable of emulating RISC-V
-#section_header "Installing/Updating QEMU"
-#STATUS="QEMU"
-#cd "$RISCV"
-#if git_check "qemu" "https://github.com/qemu/qemu" "$RISCV/include/qemu-plugin.h"; then
-  #  cd qemu
+# section_header "Installing/Updating QEMU"
+# STATUS="QEMU"
+# cd "$RISCV"
+# if git_check "qemu" "https://github.com/qemu/qemu" "$RISCV/include/qemu-plugin.h"; then
+#    cd qemu
 #    git reset --hard && git clean -f && git checkout master && git pull --recurse-submodules -j "${NUM_THREADS}"
- #   git submodule update --init --recursive
-  #  ./configure --target-list=riscv64-softmmu --prefix="$RISCV"
-   # make -j "${NUM_THREADS}" 2>&1 | logger qemu; [ "${PIPESTATUS[0]}" == 0 ]
+#    git submodule update --init --recursive
+#    ./configure --target-list=riscv64-softmmu --prefix="$RISCV"
+#    make -j "${NUM_THREADS}" 2>&1 | logger qemu; [ "${PIPESTATUS[0]}" == 0 ]
 #    make install 2>&1 | logger qemu; [ "${PIPESTATUS[0]}" == 0 ]
-  #  if [ "$clean" ]; then
-   #     cd "$RISCV"
-    #    rm -rf qemu
-  #  fi
-  #  echo -e "${SUCCESS_COLOR}QEMU successfully installed/updated!${ENDC}"
-#else
-  #  echo -e "${SUCCESS_COLOR}QEMU already up to date.${ENDC}"
-#fi
+#    if [ "$clean" ]; then
+#        cd "$RISCV"
+#        rm -rf qemu
+#    fi
+#    echo -e "${SUCCESS_COLOR}QEMU successfully installed/updated!${ENDC}"
+# else
+#    echo -e "${SUCCESS_COLOR}QEMU already up to date.${ENDC}"
+# fi
 
 
 # Spike (https://github.com/riscv-software-src/riscv-isa-sim)
@@ -327,18 +328,6 @@ else
     echo -e "${SUCCESS_COLOR}Sail Compiler already installed.${ENDC}"
 fi
 
-echo -e "\n\n\n \$RISCV/bin\n"
-ls -l "$RISCV"/bin
-
-echo -e "\n\n\n \$RISCV/share\n"
-ls -l "$RISCV"/share
-
-echo -e "\n\n\n \$RISCV/share/sail\n"
-ls -l "$RISCV"/share/sail
-
-echo -e "\n\n\n \$RISCV/share/sail/lib\n"
-ls -l "$RISCV"/share/sail/lib
-
 # RISC-V Sail Model (https://github.com/riscv/sail-riscv)
 # The RISC-V Sail Model is the golden reference model for RISC-V. It is written in Sail (described above)
 section_header "Installing/Updating RISC-V Sail Model"