-
-
Notifications
You must be signed in to change notification settings - Fork 271
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
clean up code: GCC warnings; add black to travis; fix linux build errors #51
Conversation
Are you sure about that GCC ARM ppa? Thanks a lot for looning into the Travis situation! |
that is arm's official ppa it should be the same as the compilers directly from their website. |
Do you have a Solo Hacker? If so could you test the generated builds for each of
via some U2F test page? The reason I'm pushing this is that I am on Debian so I can't test PPAs properly, but the outcome of #50 (comment) was that Debian's packages did not produce working HEX files while the ARM website downloads do (they both build). |
the builds work on my computer using the ARM website downloads, as i only just found out about the ppa. |
the builds work on my computer using the ARM website downloads, as i only just found out about the ppa.
nice!
thank!
Travis is a bit useless as is, so I'm happy to merge that part and we can iterate from there. |
Would you be able to add something to Travis that runs |
Oh, and can you point me to the Debian ARM package bug? |
Rebased on master |
Thanks for all these fixes so far, @conorpp will review the C changes. |
@@ -42,11 +42,15 @@ tinycbor/Makefile crypto/tiny-AES-c/aes.c: | |||
.PHONY: cbor | |||
cbor: $(LIBCBOR) | |||
|
|||
$(LIBCBOR): tinycbor/Makefile | |||
$(LIBCBOR): |
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.
If you leave that dependency in, it should automatically check out the submodule if it's not there.
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.
however it will then only rebuild Cbor if the makefile (which does not happen) changes even if you change architectures, which breaks builds
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.
Changing architecture doesn't indicate a code change. I think if you're going to change architecture you just have to do a make clean
first. If the current make clean
doesn't clean tinycbor
then that should be fixed, which would then allow this auto-checkout still work and an alternate architecture to build correctly after a make clean
.
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.
good point will fix
@pjz the makefile in general is overly complex, and not consistent and should probably be rewritten, however i tried to work around the existing structure. thanks for the review |
Travis build finaly fixed with stm32l432 code built and black run on the python |
We require contributors to sign our Copyright License Agreement, and we don't have @yparitcher on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help. |
We require contributors to sign our Copyright License Agreement, and we don't have @yparitcher on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help. |
Rebased on master |
my commits in this pull request are licensed under the GPLv2 thereby resolving licensing issues. |
We require contributors to sign our Copyright License Agreement, and we don't have @yparitcher on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help. |
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 like getting rid of the warnings for sure, but I don't like adding
#if DEBUG_LEVEL > 0
...
#endif
for every unused variable. It's a bit messy, and I think it'd be better to leave/ignore the unused-related warnings.
Sorry for taking a long time to get around to this. Could you take a look at the conflicts? Also would it be okay to dual license under MIT+Apache2? Just updated the license for the repo. |
This reverts commit e10ad70.
We require contributors to sign our Copyright License Agreement, and we don't have @yparitcher on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help. |
We require contributors to sign our Copyright License Agreement, and we don't have @yparitcher on file. In order for us to review and merge your code, please visit https://solokeys.com/legal/contributors, or contact @nickray, @conorpp or @0x0ece for further information or help. |
MIT+Apache2 is fine |
Please remove the cla-bot |
let me know if i need to change anything |
Looks good, thanks!! |
Ensure compatibility with python-fido2 0.8 (fixes solokeys#49)
fix some build errors on linux
clean up the build so only the appropriate parts are made for each build.
fixes all GCC warnings