-
Notifications
You must be signed in to change notification settings - Fork 20
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.
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
Add autogenerated license information for rootfs.ext2 #80
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,3 +5,4 @@ libcmt* | |
.github | ||
.git | ||
*.md | ||
fs | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
third-party |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,54 +1,22 @@ | ||
FROM --platform=$BUILDPLATFORM ubuntu:22.04 AS cross-builder | ||
ENV BUILD_BASE=/tmp/build-extra | ||
|
||
# Install dependencies | ||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && \ | ||
apt-get install -y --no-install-recommends \ | ||
ca-certificates \ | ||
wget \ | ||
patch \ | ||
libdigest-sha-perl \ | ||
libc6-dev-riscv64-cross \ | ||
gcc-12-riscv64-linux-gnu \ | ||
&& \ | ||
adduser developer -u 499 --gecos ",,," --disabled-password && \ | ||
mkdir -p ${BUILD_BASE} && chown -R developer:developer ${BUILD_BASE} && \ | ||
rm -rf /var/lib/apt/lists/* | ||
|
||
USER developer | ||
WORKDIR ${BUILD_BASE} | ||
|
||
# Build benchmark binaries | ||
COPY fs/dhrystone.patch ${BUILD_BASE}/ | ||
COPY fs/shasumfile ${BUILD_BASE}/ | ||
RUN mkdir benchmarks && cd benchmarks && \ | ||
wget https://www.netlib.org/benchmark/whetstone.c https://www.netlib.org/benchmark/dhry-c && \ | ||
shasum -ca 256 ../shasumfile &&\ | ||
bash dhry-c && \ | ||
patch -p1 < ../dhrystone.patch && \ | ||
riscv64-linux-gnu-gcc-12 -O2 -o whetstone whetstone.c -lm && \ | ||
riscv64-linux-gnu-gcc-12 -O2 -o dhrystone dhry_1.c dhry_2.c -lm | ||
|
||
# Final image | ||
FROM --platform=linux/riscv64 riscv64/ubuntu:22.04 | ||
ARG TOOLS_DEB=machine-emulator-tools-v0.15.0.deb | ||
FROM --platform=linux/riscv64 ubuntu:22.04 | ||
ARG TOOLS_DEB=machine-emulator-tools-v0.16.2.deb | ||
ADD ${TOOLS_DEB} /tmp/ | ||
RUN apt-get update && \ | ||
apt-get install -y --no-install-recommends \ | ||
busybox-static=1:1.30.1-7ubuntu3 \ | ||
coreutils=8.32-4.1ubuntu1.2 \ | ||
bash=5.1-6ubuntu1.1 \ | ||
psmisc=23.4-2build3 \ | ||
bc=1.07.1-3build1 \ | ||
curl=7.81.0-1ubuntu1.18 \ | ||
device-tree-compiler=1.6.1-1 \ | ||
jq=1.6-2.1ubuntu3 \ | ||
lua5.4=5.4.4-1 \ | ||
lua-socket=3.0~rc1+git+ac3201d-6 \ | ||
xxd=2:8.2.3995-1ubuntu2.18 \ | ||
file=1:5.41-3ubuntu0.1 \ | ||
/tmp/${TOOLS_DEB} \ | ||
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ | ||
busybox-static=1:1.30.1-7ubuntu3 \ | ||
coreutils=8.32-4.1ubuntu1.2 \ | ||
bash=5.1-6ubuntu1.1 \ | ||
psmisc=23.4-2build3 \ | ||
bc=1.07.1-3build1 \ | ||
curl=7.81.0-1ubuntu1.18 \ | ||
device-tree-compiler=1.6.1-1 \ | ||
jq=1.6-2.1ubuntu3 \ | ||
lua5.4=5.4.4-1 \ | ||
lua-socket=3.0~rc1+git+ac3201d-6 \ | ||
xxd=2:8.2.3995-1ubuntu2.19 \ | ||
file=1:5.41-3ubuntu0.1 \ | ||
stress-ng=0.13.12-2ubuntu1 \ | ||
/tmp/${TOOLS_DEB} \ | ||
&& \ | ||
rm -rf /var/lib/apt/lists/* /tmp/${TOOLS_DEB} | ||
COPY --chown=root:root --from=cross-builder /tmp/build-extra/benchmarks/whetstone /usr/bin/ | ||
COPY --chown=root:root --from=cross-builder /tmp/build-extra/benchmarks/dhrystone /usr/bin/ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Don't we track files in this directory?
Can you confirm you intention by doing this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we are making a bit of a mess here. We have a
Dockerfile
outside thefs/
directory and others inside it. The externalDockerfile
does not depend on anything that exists inside thefs/
directory. So as far as it's concerned, it's fine to havefs
in.dockerignore
. Thefs/Dockerfile
depends only onfs/Dockerfile
itself. So it doesn't really care. If there was some file, sayfs/foo.txt
on whichfs/Dockerfile
depended, and iffs/Dockerfile
was built from the outside using the outside as the build context, then this.dockerignore
would be a problem. We do build from outside using the outside as build context to pick the TOOLS_DEB, but there is nothing insidefs/
that we care about when buildingrootfs.ext2
. Did I miss something?