Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding ghdl and gtkwave to container #59

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Adding ghdl and gtkwave to container #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68844a7
Adding ghdl and gtkwave to container
glennchid Sep 17, 2024
cb7c289
Adding cocotb to container
glennchid Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/scripts/install-ghdl.sh
View file
Open in desktop
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
View file
Open in desktop
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
9 changes: 6 additions & 3 deletions Dockerfile
View file
Open in desktop
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,9 +48,12 @@ 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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment should probably be updated: For the documentation and tests

RUN pip3 install matplotlib \
RUN pip3 install \
cocotb \
matplotlib \
rst2pdf \
sphinx \
sphinx-rtd-theme \
Expand Down
Loading