From c546a554960156e91004ecba813d06a9f43a4fa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Est=C3=A9vez?= Date: Sat, 9 Sep 2023 09:00:58 +0200 Subject: [PATCH] maia-sdr-devel: update OSS CAD suite and amaranth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also pins the versions of these tools. Signed-off-by: Daniel Estévez --- maia-sdr-devel/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/maia-sdr-devel/Dockerfile b/maia-sdr-devel/Dockerfile index 44ef24f..eeb8c94 100644 --- a/maia-sdr-devel/Dockerfile +++ b/maia-sdr-devel/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 FROM ubuntu:22.04 +ARG OSS_CAD_SUITE_RELEASE=20230909 +ARG AMARANTH_HASH=a9d03805fff8c3d4f6769320323dbf44619fe422 + ARG DEBIAN_FRONTEND=noninteractive COPY vivado2021_2_gcc-arm-linux-gnueabi.tar.xz / ENV RUSTUP_HOME=/opt/rust @@ -24,12 +27,13 @@ RUN apt-get update \ && pip install -U pip \ && pip install cocotb cocotb-bus \ && cd /tmp \ - && wget https://github.com/YosysHQ/oss-cad-suite-build/releases/download/2023-09-03/oss-cad-suite-linux-x64-20230903.tgz \ + && wget https://github.com/YosysHQ/oss-cad-suite-build/releases/download/${OSS_CAD_SUITE_RELEASE:0:4}-${OSS_CAD_SUITE_RELEASE:4:6}-${OSS_CAD_SUITE_RELEASE:6:8}/oss-cad-suite-linux-x64-${OSS_CAD_SUITE_RELEASE}.tgz \ && mkdir /opt/oss-cad-suite \ - && tar zxf oss-cad-suite-linux-x64-20230903.tgz -C /opt \ - && rm -f oss-cad-suite-linux-x64-20230903.tgz \ + && tar zxf oss-cad-suite-linux-x64-${OSS_CAD_SUITE_RELEASE}.tgz -C /opt \ + && rm -f oss-cad-suite-linux-x64-${OSS_CAD_SUITE_RELEASE}.tgz \ && git clone https://github.com/amaranth-lang/amaranth \ && cd amaranth \ + && git checkout $AMARANTH_HASH \ && pip install . \ && cd .. \ && rm -rf amaranth \