From 8f49c527d91b7dff445f2a096d0d0846b217c175 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Thu, 29 Aug 2024 08:41:33 -0700
Subject: [PATCH] No more opam

---
 bin/wally-package-install.sh    |  2 +-
 bin/wally-tool-chain-install.sh | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh
index 8fea2d27b..b823066e3 100755
--- a/bin/wally-package-install.sh
+++ b/bin/wally-package-install.sh
@@ -80,7 +80,7 @@ elif [ "$FAMILY" == ubuntu ]; then
     QEMU_PACKAGES+=(libfdt-dev libpixman-1-dev)
     SPIKE_PACKAGES+=(device-tree-compiler libboost-regex-dev libboost-system-dev)
     VERILATOR_PACKAGES+=(help2man perl g++ clang ccache libunwind-dev libgoogle-perftools-dev numactl perl-doc libfl2 libfl-dev zlib1g)
-    SAIL_PACKAGES+=(opam z3)
+    SAIL_PACKAGES+=(z3)
     BUILDROOT_PACKAGES+=(ncurses-base ncurses-bin libncurses-dev gfortran cpio) # gfortran is only needed for compiling spec benchmarks on buildroot linux
     VIVADO_PACKAGES+=(libncurses*) # Vivado hangs on the third stage of installation without this
 fi
diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
index a9b269c7d..cac89dda7 100755
--- a/bin/wally-tool-chain-install.sh
+++ b/bin/wally-tool-chain-install.sh
@@ -322,22 +322,6 @@ else
 fi
 
 
-# Install opam from binary disribution on rhel as it is not available from dnf
-# Opam is needed to install the sail compiler
-if [ "$FAMILY" == rhel ]; then
-    section_header "Installing/Updating Opam"
-    STATUS="Opam"
-    export OPAMROOTISOK=1 # Silence warnings about running opam as root
-    cd "$RISCV"
-    mkdir -p opam
-    cd opam
-    wget https://raw.githubusercontent.com/ocaml/opam/master/shell/install.sh
-    printf '%s\n' "$RISCV"/bin Y | sh install.sh # the print command provides $RISCV/bin as the installation path when prompted
-    cd "$RISCV"
-    rm -rf opam
-    echo -e "${SUCCESS_COLOR}Opam successfully installed/updated!${ENDC}"
-fi
-
 # Sail Compiler (https://github.com/rems-project/sail)
 # Sail is a formal specification language designed for describing the semantics of an ISA.
 # It is used to generate the RISC-V Sail Model, which is the golden reference model for RISC-V.