From f08f88aac0cdf8b6396a2a65f404a7f34f027949 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 26 Apr 2021 12:11:47 -0500 Subject: [PATCH 1/4] Update sbt installation Bintray has gone down. SBT's website now provides these as install commands. --- scripts/centos-req.sh | 8 +++++++- scripts/ubuntu-req.sh | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/centos-req.sh b/scripts/centos-req.sh index 89e8644c36..c7107dbc77 100755 --- a/scripts/centos-req.sh +++ b/scripts/centos-req.sh @@ -4,7 +4,13 @@ set -ex sudo yum groupinstall -y "Development tools" sudo yum install -y gmp-devel mpfr-devel libmpc-devel zlib-devel vim git java java-devel -curl https://bintray.com/sbt/rpm/rpm | sudo tee /etc/yum.repos.d/bintray-sbt-rpm.repo + +# Install SBT https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html#Red+Hat+Enterprise+Linux+and+other+RPM-based+distributions +# sudo rm -f /etc/yum.repos.d/bintray-rpm.repo +# Use rm above if sbt installed from bintray before. +curl -L https://www.scala-sbt.org/sbt-rpm.repo > sbt-rpm.repo +sudo mv sbt-rpm.repo /etc/yum.repos.d/ + sudo yum install -y sbt texinfo gengetopt sudo yum install -y expat-devel libusb1-devel ncurses-devel cmake "perl(ExtUtils::MakeMaker)" # deps for poky diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index 3bc22c7395..cb74691e35 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -4,8 +4,8 @@ set -ex sudo apt-get install -y build-essential bison flex sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim git default-jdk default-jre -# install sbt: https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html -echo "deb https://dl.bintray.com/sbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list +# install sbt: https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions +echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | sudo tee -a /etc/apt/sources.list.d/sbt.list curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add sudo apt-get update sudo apt-get install -y sbt From 7228a7f9b45e93b9f293d8dbac5b2f51d432422e Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 26 Apr 2021 12:45:55 -0500 Subject: [PATCH 2/4] Add missing dependency for building verilator on Ubuntu --- scripts/ubuntu-req.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index cb74691e35..cbb5230f18 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -21,6 +21,7 @@ sudo apt-get install -y python3-pip python3.6-dev rsync libguestfs-tools expat c sudo apt-get install -y device-tree-compiler # install verilator +sudo apt-get install -y autoconf git clone http://git.veripool.org/git/verilator cd verilator git checkout v4.034 From 67a29f56ab3f4dbea08dcf679f7a57a34fd91555 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 26 Apr 2021 13:51:59 -0500 Subject: [PATCH 3/4] Use nproc to determine number of cores in CentOS verilator build --- scripts/centos-req.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/centos-req.sh b/scripts/centos-req.sh index c7107dbc77..1e2557b76c 100755 --- a/scripts/centos-req.sh +++ b/scripts/centos-req.sh @@ -29,4 +29,4 @@ sudo yum install -y dtc git clone http://git.veripool.org/git/verilator cd verilator git checkout v4.034 -autoconf && ./configure && make -j16 && sudo make install +autoconf && ./configure && make -j$(nproc) && sudo make install From d5893adad605b9be9e9ad8a5460b5023f2b9ff25 Mon Sep 17 00:00:00 2001 From: Karl Hallsby Date: Mon, 26 Apr 2021 13:57:47 -0500 Subject: [PATCH 4/4] Install curl in Ubuntu requirements Ubuntu does not ship with curl by default any more. If we are to use curl to install SBT's required information, we must ensure it is available for use on Ubuntu. --- scripts/ubuntu-req.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index cbb5230f18..ee3a9de5ee 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -2,6 +2,7 @@ set -ex +sudo apt-get install -y curl sudo apt-get install -y build-essential bison flex sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim git default-jdk default-jre # install sbt: https://www.scala-sbt.org/release/docs/Installing-sbt-on-Linux.html#Ubuntu+and+other+Debian-based+distributions