From 25f85ffa0e82ceb7b2aab7dc0c186e2dedcfb464 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 26 Apr 2021 13:50:33 -0500 Subject: [PATCH] Bump installed versions of python to 3.8 Ubuntu 20.04 LTS (the most recent LTS release) stopped shipping Python 3.6 in their default repositories. Upping it to Python 3.8 does not seem to have broken the design/elaboration process. I tested re-building Chipyard and all its dependencies using this new version, and everything appears to have remained the same. --- scripts/centos-req.sh | 4 ++-- scripts/ubuntu-req.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/centos-req.sh b/scripts/centos-req.sh index 89e8644c36..a52aea6315 100755 --- a/scripts/centos-req.sh +++ b/scripts/centos-req.sh @@ -8,11 +8,11 @@ curl https://bintray.com/sbt/rpm/rpm | sudo tee /etc/yum.repos.d/bintray-sbt-rpm sudo yum install -y sbt texinfo gengetopt sudo yum install -y expat-devel libusb1-devel ncurses-devel cmake "perl(ExtUtils::MakeMaker)" # deps for poky -sudo yum install -y python36 patch diffstat texi2html texinfo subversion chrpath git wget +sudo yum install -y python38 patch diffstat texi2html texinfo subversion chrpath git wget # deps for qemu sudo yum install -y gtk3-devel # deps for firemarshal -sudo yum install -y python36-pip python36-devel rsync libguestfs-tools makeinfo expat ctags +sudo yum install -y python38-pip python38-devel rsync libguestfs-tools makeinfo expat ctags # Install GNU make 4.x (needed to cross-compile glibc 2.28+) sudo yum install -y centos-release-scl sudo yum install -y devtoolset-8-make diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index 3bc22c7395..fc149efc09 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -12,11 +12,11 @@ sudo apt-get install -y sbt sudo apt-get install -y texinfo gengetopt sudo apt-get install -y libexpat1-dev libusb-dev libncurses5-dev cmake # deps for poky -sudo apt-get install -y python3.6 patch diffstat texi2html texinfo subversion chrpath git wget +sudo apt-get install -y python3.8 patch diffstat texi2html texinfo subversion chrpath git wget # deps for qemu sudo apt-get install -y libgtk-3-dev gettext # deps for firemarshal -sudo apt-get install -y python3-pip python3.6-dev rsync libguestfs-tools expat ctags +sudo apt-get install -y python3-pip python3.8-dev rsync libguestfs-tools expat ctags # install DTC sudo apt-get install -y device-tree-compiler