wu-arch/chipyard
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Clean br-base after building to keep only the br.XXXX.img file around

Browse Source 
which is the painful one to build. Also moves the SHELL command earlier.
This commit is contained in:
Nathan Pemberton
2021-08-24 19:54:51 -04:00
parent 83101cd679
commit 554b436390
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dockerfiles/Dockerfile
View File

@@ -7,6 +7,8 @@ ARG CHIPYARD_HASH
MAINTAINER https://groups.google.com/forum/#!forum/chipyard MAINTAINER https://groups.google.com/forum/#!forum/chipyard
SHELL ["/bin/bash", "-c"]
# Install dependencies for ubuntu-req.sh # Install dependencies for ubuntu-req.sh
RUN apt-get update && \ RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -54,14 +56,16 @@ RUN cd chipyard && \
./scripts/build-toolchains.sh esp-tools 1>/dev/null ./scripts/build-toolchains.sh esp-tools 1>/dev/null
# Set up FireMarshal # Set up FireMarshal. Building and cleaning br-base.json builds the underlying
SHELL ["/bin/bash", "-c"] # buildroot image (which takes a long time) but doesn't keep all the br-base
# stuff around (since that's faster to rebuild).
RUN cd chipyard && \ RUN cd chipyard && \
source env.sh && \ source env.sh && \
cd software/firemarshal && \ cd software/firemarshal && \
./init-submodules.sh && \ ./init-submodules.sh && \
pip3 install -r python-requirements.txt && \ pip3 install -r python-requirements.txt && \
marshal build br-base.json marshal build br-base.json && \
marshal clean br-base.json
# Run script to set environment variables on entry # Run script to set environment variables on entry