backport: 2018.10 compile fixes#10759
Merged
miri64 merged 3 commits intoRIOT-OS:2018.10-branchfrom Jan 14, 2019
Merged
Conversation
kaspar030
added
CI: ready for build
miri64
added
Area: build system
Member
|
Can you please reference the original commits somewhere? |
kaspar030
added
CI: ready for build
Upstream rewrote history in master which changed our reference commit from
intel/tinycrypt@3ea1a60
to
intel/tinycrypt@6a22712
Diff can be verified to be empty with:
intel/tinycrypt@6a22712...3ea1a60
(cherry-picked from a07ac29)
(cherry-picked from 47a6626)
(cherry-picked from f56d8d1)
kaspar030
force-pushed
the
2018.10-compile-fixes
branch
from
4e9989b to
d663f4d
Compare
Contributor
Author
Done. Only after I learned about "git cherry-pick -x" ... |
Member
|
Unrelated problem: I think Travis tries to rebase to master. We should fix that. |
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
4 participants
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.
Contribution description
Backport of some compile fixes from master.
Testing procedure
Compilation by CI should be sufficient.
Issues/PRs references
Needed to make #10757 pass CI.