Skip to content

pkg/tinycrypt: update commit hash after upstream rewrote history#10470

Merged
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/tinycryt/use_updated_commit_version
Nov 26, 2018
Merged

pkg/tinycrypt: update commit hash after upstream rewrote history#10470
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/tinycryt/use_updated_commit_version

Conversation

@cladmi
Copy link
Copy Markdown
Contributor

@cladmi cladmi commented Nov 26, 2018

Contribution description

Upstream rewrote history in master which changed our reference commit from

https://github.com/01org/tinycrypt/commit/3ea1a609e7aff9f2d8d13803e1076b7a8e551804

to

https://github.com/01org/tinycrypt/commit/6a22712bebbf2fc60d9fc6192dddefd5ad1933e3

Diff can be verified to be empty with:

https://github.com/01org/tinycrypt/compare/6a22712bebbf2fc60d9fc6192dddefd5ad1933e3...3ea1a609e7aff9f2d8d13803e1076b7a8e551804

Testing procedure

Murdock should build without failure to find tinycrypt commit.
And verify the commits content are the same.

Issues/PRs references

Main issue about upstream changing history is done in #10468

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
@cladmi cladmi added Area: pkg Area: External package ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: security Area: Security-related libraries and subsystems labels Nov 26, 2018
@cladmi cladmi requested a review from haukepetersen November 26, 2018 15:03
Copy link
Copy Markdown
Contributor

@jcarrano jcarrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One can also use this to check both commits are the same:

$ git clone --mirror [email protected]:01org/tinycrypt.git
$ cd tinycrypt.git
$ git branch the-missing-commit 3ea1a609e7aff9f2d8d13803e1076b7a8e551804
$ git diff the-missing-commit 6a22712bebbf2fc60d9fc6192dddefd5ad1933e3

@jcarrano
Copy link
Copy Markdown
Contributor

I know @haukepetersen was requested for review, but given that this is blocking everyone, I'm intervening the situation.

@jcarrano jcarrano merged commit 364c528 into RIOT-OS:master Nov 26, 2018
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Nov 27, 2018

Thanks for the review

@cladmi cladmi deleted the pr/tinycryt/use_updated_commit_version branch November 27, 2018 11:28
@aabadie aabadie added this to the Release 2019.01 milestone Dec 2, 2018
@miri64 miri64 added the Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) label Dec 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: pkg Area: External package ports Area: security Area: Security-related libraries and subsystems CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants