diff --git a/bin/wally-distro-check.sh b/bin/wally-distro-check.sh index bd4de121b..5dfbf015e 100755 --- a/bin/wally-distro-check.sh +++ b/bin/wally-distro-check.sh @@ -91,8 +91,8 @@ elif [[ "$ID" == debian || "$ID_LIKE" == *debian* ]]; then "is $PRETTY_NAME. The regular Debian install will be attempted, but there may be issues." fi export DEBIAN_VERSION="$VERSION_ID" - if (( DEBIAN_VERSION < 12 )); then - printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian version 12. You have version $VERSION." + if (( DEBIAN_VERSION < 11 )); then + printf "${FAIL_COLOR}%s\n${ENDC}" "The Wally install script has only been tested with Debian versions 11 and 12. You have version $VERSION." exit 1 fi else diff --git a/bin/wally-package-install.sh b/bin/wally-package-install.sh index e780298bd..fe3c9bf1c 100755 --- a/bin/wally-package-install.sh +++ b/bin/wally-package-install.sh @@ -71,8 +71,12 @@ elif [[ "$FAMILY" == ubuntu || "$FAMILY" == debian ]]; then OTHER_PACKAGES+=(gcc-10 g++-10 cpp-10) # Newer version of gcc needed for Verilator elif (( DEBIAN_VERSION >= 12 )); then PYTHON_VERSION=python3.11 - if (( UBUNTU_VERSION != 20 )); then - VERILATOR_PACKAGES+=(mold) # Not availale in Ubuntu 20.04, binary will be downloaded instead + elif (( DEBIAN_VERSION >= 11 )); then + PYTHON_VERSION=python3.9 + fi + # Mold not available in older distros for Verilator, will download binary instead + if (( UBUNTU_VERSION != 20 && DEBIAN_VERSION != 11 )); then + VERILATOR_PACKAGES+=(mold) fi PACKAGE_MANAGER="DEBIAN_FRONTEND=noninteractive apt-get" UPDATE_COMMAND="sudo $PACKAGE_MANAGER update -y && sudo $PACKAGE_MANAGER upgrade -y --with-new-pkgs" diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh index c22aed822..10c4276c7 100755 --- a/bin/wally-tool-chain-install.sh +++ b/bin/wally-tool-chain-install.sh @@ -264,7 +264,7 @@ if (( RHEL_VERSION == 8 )); then fi # Mold needed for Verilator -if (( UBUNTU_VERSION == 20 )); then +if (( UBUNTU_VERSION == 20 || DEBIAN_VERSION == 11 )); then STATUS="mold" if [ ! -e "$RISCV"/bin/mold ]; then section_header "Installing mold"