Skip to content

Commit c78b438

Browse files
committed
Update yosys version in Dockerfile to 0.23
That matches Debian Bookworm Also remove a stray yosys apt-get in .gitlab/ci/oscope.gitlab-ci.yml
1 parent 87806ba commit c78b438

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.gitlab/ci/oscope.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ oscope_top_bmb7:
1919

2020
oscope_top_marble:
2121
before_script:
22-
- cd projects/oscope/marble_family && ls /non-free && apt-get update && apt-get install -y yosys
22+
- cd projects/oscope/marble_family && ls /non-free
2323
stage: synthesis
2424
script:
2525
- verilator -V && XILINX_VIVADO=$XILINX_VIVADO PATH=$XILINX_VIVADO/bin:$PATH make oscope_top.bit

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ RUN git clone https://github.com/ldoolitt/vhd2vl && \
4747
# Yosys
4848
# For now we need to build yosys from source, since Debian Bullseye
4949
# is stuck at yosys-0.9 that doesn't have the features we need.
50-
# Revisit this choice when Debian catches up, maybe in Bookworm,
51-
# and hope to get back to "apt-get install yosys" then.
50+
# Commit 7ce5011 corresponds to yosys-0.23 2022-11-08, matching
51+
# the version in Debian Bookworm.
5252
# Note that the standard yosys build process used here requires
53-
# network access to download abc from https://github.com/berkeley-abc/abc.
53+
# network access to download abc from https://github.com/YosysHQ/abc.
5454
RUN apt-get update && \
5555
apt-get install -y \
5656
clang \
@@ -66,7 +66,7 @@ RUN apt-get update && \
6666
rm -rf /var/lib/apt/lists/* && \
6767
git clone https://github.com/cliffordwolf/yosys.git && \
6868
cd yosys && \
69-
git checkout 40e35993af6ecb6207f15cc176455ff8d66bcc69 && \
69+
git checkout 7ce5011c24bc4c605578bb16576cadf79373e23f && \
7070
make config-clang && \
7171
make -j4 && \
7272
make install && \

0 commit comments

Comments
 (0)