From 1076b9c179d709ff8b904afdf50c0fc5405233ff Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Sun, 13 Oct 2024 19:44:16 -0700 Subject: [PATCH] Use python 3.11 for rhel 8 --- bin/wally-package-install.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh index 725d3b201..94631ad6a 100755 --- a/bin/wally-package-install.sh +++ b/bin/wally-package-install.sh @@ -46,7 +46,12 @@ fi # Generate list of packages to install and package manager commands based on distro # Packages are grouped by which tool requires them. If multiple tools need a package, it is included in the first tool only if [ "$FAMILY" == rhel ]; then - PYTHON_VERSION=python3.12 + if (( RHEL_VERSION == 8 )); then + PYTHON_VERSION=python3.11 + elif (( RHEL_VERSION >= 9 )); then + PYTHON_VERSION=python3.12 + VERILATOR_PACKAGES+=(perl-doc) # Not availale in rhel8, nice for Verilator + fi PACKAGE_MANAGER="dnf" UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y" GENERAL_PACKAGES+=(which rsync git make cmake "$PYTHON_VERSION" "$PYTHON_VERSION"-pip curl wget tar pkgconf-pkg-config dialog mutt ssmtp) @@ -55,10 +60,6 @@ if [ "$FAMILY" == rhel ]; then SPIKE_PACKAGES+=(dtc boost-regex boost-system) VERILATOR_PACKAGES+=(help2man perl clang ccache gperftools numactl mold) BUILDROOT_PACKAGES+=(ncurses-base ncurses ncurses-libs ncurses-devel gcc-gfortran cpio) # gcc-gfortran is only needed for compiling spec benchmarks on buildroot linux - # Extra packages not availale in rhel8, nice for Verilator - if (( RHEL_VERSION >= 9 )); then - VERILATOR_PACKAGES+=(perl-doc) - fi # A newer version of gcc is required for qemu OTHER_PACKAGES=(gcc-toolset-13) elif [ "$FAMILY" == ubuntu ]; then