Skip to content

Commit

Permalink
Adding ghdl and gtkwave to container
Browse files Browse the repository at this point in the history
  • Loading branch information
glennchid committed Sep 17, 2024
1 parent aee0499 commit 68844a7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
10 changes: 10 additions & 0 deletions .github/scripts/install-ghdl.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion .github/scripts/tar-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down

0 comments on commit 68844a7

Please sign in to comment.