Skip to content

Commit

Permalink
Fix tar
Browse files Browse the repository at this point in the history
  • Loading branch information
jordancarlin authored Sep 8, 2024
1 parent cf03316 commit dfeaf7f
Showing 1 changed file with 36 additions and 47 deletions.
83 changes: 36 additions & 47 deletions bin/wally-tool-chain-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
## Modified: 22 January 2023
## Modified: 23 March 2023
## Modified: 30 June 2024, Jordan Carlin [email protected]
## Modified: 1 September 2024
##
## Purpose: Open source tool chain installation script
##
Expand Down Expand Up @@ -153,32 +154,32 @@ 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
STATUS="gmp"
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}"
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit dfeaf7f

Please sign in to comment.