Draft
Conversation
de0db02 to
a9b9396
Compare
- Add a tkey-app-builder OCI image source: contrib/tkey-app-builder.dockerfile - Move the qemu source under contrib. - Update documentation to reflect this.
Temporary fix to make qemu build with our new tkey-app-builder by installing missing package for Python venv and some more supporting packages to be able to build. The 444ee3d26c3acf651ff1bbb12023034ccee6ed68 commit to build the firmware doesn't seem to exist anymore in tillitis-key1 so we use the TK1-23.03.2 tag instead. Of course the digest will be different when we build with new version of the tools. We have to figure this out somehow, that is build a Bellatrix version of a more modern codebase. We probably also want to make the Ubuntu runtime slimmer.
a9b9396 to
7befd31
Compare
Member
|
A few comments:
Requires git and bash. |
deadprogram
reviewed
Dec 17, 2024
| # have this as part of its name, the tag is then used for versioning the image | ||
| # (could be updates to the TKey QEMU machine). | ||
| ARG TKEYREPO_TAG=TK1-23.03.1 | ||
| ARG TKEYREPO_TAG=TK1-23.03.2 |
There was a problem hiding this comment.
Perhaps this could be the current release version?
Suggested change
| ARG TKEYREPO_TAG=TK1-23.03.2 | |
| ARG TKEYREPO_TAG=TK1-24.03 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Containerfile for tkey-app-builder. Moves the qemu dockerfile to contrib as well, adds make targets, and updates docs accordingly.
Note that the make target doesn't successfully build the qemu OCI image. This is true also for trying to build the qemu image from the dockerfile in the main branch! See #8.
A temporary fix to build qemu with the new tkey-app-builder is included in this PR. I don't know if we can use that somehow.
Relates to tillitis/tillitis-key1#272
Type of change
Please tick any that are relevant to this PR and remove any that aren't.
Submission checklist