Nickez/support arm64 in docker #1284
Merged
Conversation
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
NickeZ
force-pushed
the
nickez/support-arm64-in-docker
branch
from
a15e95a
to
9247f24
Compare
benma
reviewed
Aug 20, 2024
benma
reviewed
Aug 20, 2024
NickeZ
force-pushed
the
nickez/support-arm64-in-docker
branch
from
9247f24
to
4357f21
Compare
In the new toolchain `assert` is defined as a macro. That interferes with the ASF function called `assert` so we undefined it right before that function is defined.
We also have to provide the search path to the linker to our dummy files libssp and libssp_nonshared. The actual implementation of the stack protector functions are in common_main.c.
NickeZ
force-pushed
the
nickez/support-arm64-in-docker
branch
from
a9e8ad2
to
2c57ea6
Compare
linux/arm64 is the default on newer macbooks with the apple cpu. The toolchain GCC 8 2018 q4 is not available for linux/arm64. So we go with the latest available, which is GCC 13.3.
NickeZ
force-pushed
the
nickez/support-arm64-in-docker
branch
from
2c57ea6
to
a662e21
Compare
|
Rebased on |
benma
requested changes
Aug 22, 2024
releases/build.sh
Outdated
Comment on lines
38
to
41
| # The firmware is only reproducible with the same host compiler. For now we force linux/amd64. | ||
| # The file .containerversion does not exist in older versions of the project. | ||
| containerversion=$(2>/dev/null cat .containerversion || echo "latest") | ||
| docker build --pull --platform linux/amd64 --force-rm --no-cache -t bitbox02-firmware:${containerversion} . |
There was a problem hiding this comment.
you don't need to tag anything here, it serves no purpose. the image is built here from scratch and used in the next line, not pulled, so the local image name/tag is irrelevant, and using .containerversion here is distracting/confusing, as it is unrelated to our shiftcrypto/firmware_v2 tagging.
Currently it is not posisble to reproducibly build the firmware due to the toolchains we have, therefore we enforce amd64.
NickeZ
force-pushed
the
nickez/support-arm64-in-docker
branch
from
a662e21
to
7ba38b1
Compare
Thompson1985
approved these changes
Oct 3, 2024
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.
No description provided.