From 68844a7b4362a1cc850519251fed76d01e442da8 Mon Sep 17 00:00:00 2001 From: "Christian, Glenn (DLSLtd,RAL,LSCI)" Date: Tue, 17 Sep 2024 15:35:54 +0100 Subject: [PATCH 1/2] Adding ghdl and gtkwave to container --- .github/scripts/install-ghdl.sh | 10 ++++++++++ .github/scripts/tar-files.sh | 2 +- Dockerfile | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .github/scripts/install-ghdl.sh diff --git a/.github/scripts/install-ghdl.sh b/.github/scripts/install-ghdl.sh new file mode 100644 index 0000000..2d2690b --- /dev/null +++ b/.github/scripts/install-ghdl.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +cd /tmp +git clone -b 'v4.0.0' https://github.com/ghdl/ghdl +cd ghdl +./configure --prefix=/usr/local +make +make install +cd +rm -r /tmp/ghdl diff --git a/.github/scripts/tar-files.sh b/.github/scripts/tar-files.sh index 10673b9..f15ef34 100755 --- a/.github/scripts/tar-files.sh +++ b/.github/scripts/tar-files.sh @@ -45,7 +45,7 @@ curl -o u-boot-xlnx-xilinx-v2022.2.tar.gz -L https://github.com/Xilinx/u-boot-xl -o device-tree-xlnx-xilinx_v2023.2.tar.gz -L https://github.com/Xilinx/device-tree-xlnx/archive/refs/tags/xilinx_v2023.2.tar.gz \ -o arm-trusted-firmware-xilinx-v2022.2.tar.gz -L https://github.com/Xilinx/arm-trusted-firmware/archive/refs/tags/xilinx-v2022.2.tar.gz \ -o arm-trusted-firmware-xilinx-v2023.2.tar.gz -L https://github.com/Xilinx/arm-trusted-firmware/archive/refs/tags/xilinx-v2023.2.tar.gz \ - -o dtc-1.7.0.tar.gz -L https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/dtc-1.7.0.tar.gz + -o dtc-1.7.0.tar.gz -L https://git.kernel.org/pub/scm/utils/dtc/dtc.git/dtc-1.7.0.tar.gz # Old url to i2c-tools tar file. No longer working # -OL http://jdelvare.nerim.net/mirror/i2c-tools/i2c-tools-3.1.1.tar.bz2 \ diff --git a/Dockerfile b/Dockerfile index 635a88b..10ad85a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,8 +35,8 @@ RUN yum -y upgrade && yum -y install \ RUN yum -y group install "Development Tools" -# Get fakeroot which needs epel-release -RUN yum -y install fakeroot +# Get dependencies from EPEL repo +RUN yum -y install fakeroot gcc-gnat gtkwave # Copy in scripts and dls rootfs, annotypes, pymalcolm, and malcolmjs COPY PandABlocks-rootfs/.github/scripts /scripts @@ -48,6 +48,7 @@ COPY malcolmjs /malcolmjs # Toolchains and tar files RUN bash scripts/GNU-toolchain.sh RUN bash scripts/tar-files.sh +RUN bash scripts/install-ghdl.sh # For the documentation RUN pip3 install matplotlib \ From cb7c2896b704ec89f57b487259223d733e935464 Mon Sep 17 00:00:00 2001 From: "Christian, Glenn (DLSLtd,RAL,LSCI)" Date: Wed, 18 Sep 2024 10:19:07 +0100 Subject: [PATCH 2/2] Adding cocotb to container --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 10ad85a..66e1f8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,7 +51,9 @@ RUN bash scripts/tar-files.sh RUN bash scripts/install-ghdl.sh # For the documentation -RUN pip3 install matplotlib \ +RUN pip3 install \ + cocotb \ + matplotlib \ rst2pdf \ sphinx \ sphinx-rtd-theme \