Skip to content

Commit

Permalink
Added cheri build setup
Browse files Browse the repository at this point in the history
  • Loading branch information
JianyiCheng committed Jul 3, 2023
1 parent f6f1c9b commit e4b3bb7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
9 changes: 5 additions & 4 deletions Docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN apt-get update -y \
libgmp-dev python3 python3-pip g++\
clang llvm lld clang-tidy clang-format \
gcc-multilib gcc cmake sudo wget vim \
curl
curl tmux git

# Install CHERI dependencies
RUN apt-get update -y \
Expand All @@ -36,7 +36,8 @@ RUN mkdir -p /srcPkgs \
&& tar xzvf verible-*-x86_64.tar.gz -C verible --strip-components 1

# Append any packages you need here
# RUN apt-get ...
# RUN apt-get update -y \
# && apt-get install -y ...

CMD ["bash"]

Expand All @@ -47,7 +48,7 @@ RUN echo "dev-user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
USER dev-user

# Install Python packages
ENV PATH="/home/dev-user/.ghcup/bin:${PATH}:/home/dev-user/.local/bin"
ENV PATH="/home/dev-user/cheri/output/sdk/bin:/home/dev-user/.ghcup/bin:${PATH}:/home/dev-user/.local/bin"
RUN pip3 install --user --upgrade pip \
&& pip3 install black colorlog toml tabulate isort
# Install GHC
Expand All @@ -63,7 +64,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | \
RUN printf "\
\nexport LIBRARY_PATH=/usr/lib/x86_64-linux-gnu:\$LIBRARY_PATH \
\n# Basic PATH setup \
\nexport PATH=/workspace/scripts:/home/dev-user/.local/bin:\$PATH:/home/dev-user/.ghcup/bin \
\nexport PATH=/home/dev-user/cheri/output/sdk/bin:/workspace/scripts:/home/dev-user/.local/bin:\$PATH:/home/dev-user/.ghcup/bin \
\n# Thread setup \
\nexport nproc=\$(grep -c ^processor /proc/cpuinfo) \
\n# Terminal color... \
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ shell: build-docker
sync:
git submodule sync
git submodule update --init --recursive
git clone https://github.com/CTSRD-CHERI/cheribuild

.PHONY: verilog
verilog:
Expand Down

0 comments on commit e4b3bb7

Please sign in to comment.