From 3b26d6a9f99534d589d82d9b91b28d1b96ae9024 Mon Sep 17 00:00:00 2001 From: Abraham Gonzalez Date: Wed, 31 Mar 2021 17:04:42 -0700 Subject: [PATCH 1/3] Bump requirements to get newer Git version (for CI) --- scripts/ubuntu-req.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index b33a6649..5f618b71 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -3,7 +3,7 @@ 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 +sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim 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 curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | sudo apt-key add @@ -12,7 +12,7 @@ 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.6 patch diffstat texi2html texinfo subversion chrpath wget # deps for qemu sudo apt-get install -y libgtk-3-dev gettext # deps for firemarshal @@ -20,6 +20,10 @@ sudo apt-get install -y python3-pip python3.6-dev rsync libguestfs-tools expat c # install DTC sudo apt-get install -y device-tree-compiler sudo apt-get install -y python +# install git >= 2.17 +sudo add-apt-repository ppa:git-core/ppa -y +sudo apt-get update +sudo apt-get install git -y # install verilator git clone http://git.veripool.org/git/verilator From ab57b7d2edaad950b0f2b99a633341fa9833274b Mon Sep 17 00:00:00 2001 From: Abraham Gonzalez Date: Wed, 31 Mar 2021 19:00:59 -0700 Subject: [PATCH 2/3] Enable add-apt-repo --- scripts/ubuntu-req.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ubuntu-req.sh b/scripts/ubuntu-req.sh index 5f618b71..4889dc48 100755 --- a/scripts/ubuntu-req.sh +++ b/scripts/ubuntu-req.sh @@ -2,7 +2,7 @@ set -ex -sudo apt-get install -y build-essential bison flex +sudo apt-get install -y build-essential bison flex software-properties-common sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim 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 From 4ab2228926c7af958ed6ccd179fb90b67c52df8e Mon Sep 17 00:00:00 2001 From: Abraham Gonzalez Date: Wed, 31 Mar 2021 19:15:34 -0700 Subject: [PATCH 3/3] Bump CI image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9c6e9f80..bdd90443 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,7 +12,7 @@ parameters: executors: main-env: docker: - - image: ucbbar/chipyard-ci-image:9c650dea + - image: ucbbar/chipyard-ci-image:ab57b7d environment: JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit