Skip to content
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

Nanostack release for mbedos 5 14 #11423

Merged

Conversation

@JarkkoPaso
Copy link
Contributor

commented Sep 5, 2019

Description

Nanostack release candidate for mbed OS 5.14.0

Following libraries updated using using git subtree:

  • features/nanostack/sal-stack-nanostack to v11.2.1

Removed Nanostack dependency to MbedTLS internal data structures.
Contains also minor fixes to Nanostack.

Pull request type

[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@artokin @mikter @mikaleppanen @juhhei01 @SeppoTakalo @kjbracey-arm

JarkkoPaso added 2 commits Sep 5, 2019
…c4..c473148

c473148 Merge branch 'release_internal' into release_external
d7ad405 Merge pull request #2179 from ARMmbed/release_internal_merge
668fc82 Merge branch 'master' into release_internal
9458a30 Added crypto library to unit test makefile
ff83e4b Added crypto library include path
4292326 Updated eapol TLS library to use extended version of export keys callback
f8f0762 Corrected authenticator EAP-TLS start retries
00fdf8d Added sending of initial EAPOL-key to original target during bootstrap
313794cf Wi-sun neighbor temporary neigh update
05fa359 added support for EAPOL timing adjustment
cfc3223 RPL parent confirmation process update
c3a2c5c Added limit to BR supplicant entries
21de90d RPL dio handler update
425a04a Fix Slaac Handler for not native IPv6 stack.
5722a4a Wi-sun multicast neighbour and RPL update

git-subtree-dir: features/nanostack/sal-stack-nanostack
git-subtree-split: c4731481674d25a516142d1d89f784fbd5e2d58e
* commit '396dae52ab4eef15910011432f2c7a4261fc22b7':
  Squashed 'features/nanostack/sal-stack-nanostack/' changes from 4a19dc4..c473148
@ciarmcom ciarmcom requested review from artokin, juhhei01, kjbracey-arm, mikaleppanen, mikter, SeppoTakalo and ARMmbed/mbed-os-maintainers Sep 5, 2019
@ciarmcom

This comment has been minimized.

Copy link
Member

commented Sep 5, 2019

@mikter
mikter approved these changes Sep 6, 2019
@artokin

This comment has been minimized.

Copy link
Contributor

commented Sep 6, 2019

CI started

@mbed-ci

This comment has been minimized.

Copy link

commented Sep 6, 2019

Test run: SUCCESS

Summary: 11 of 11 test jobs passed
Build number : 1
Build artifacts

@0xc0170
0xc0170 approved these changes Sep 6, 2019
@0xc0170

This comment has been minimized.

Copy link
Member

commented Sep 6, 2019

Shall be ready for integration today?!

@0xc0170 0xc0170 merged commit c2df001 into ARMmbed:master Sep 6, 2019
25 checks passed
25 checks passed
continuous-integration/jenkins/pr-head This commit looks good
Details
jenkins-ci/build-ARM Success
Details
jenkins-ci/build-GCC_ARM Success
Details
jenkins-ci/build-IAR Success
Details
jenkins-ci/cloud-client-test Success
Details
jenkins-ci/dynamic-memory-usage RTOS ROM(+0 bytes) RAM(+72 bytes)
Details
jenkins-ci/exporter Success
Details
jenkins-ci/greentea-test Success
Details
jenkins-ci/mbed2-build-ARM Success
Details
jenkins-ci/mbed2-build-GCC_ARM Success
Details
jenkins-ci/mbed2-build-IAR Success
Details
jenkins-ci/unittests Success
Details
travis-ci/astyle Success!
Details
travis-ci/docs Success!
Details
travis-ci/doxy-spellcheck Success!
Details
travis-ci/events Success! Runtime is 8684 cycles.
Details
travis-ci/gitattributestest Success!
Details
travis-ci/include_check Success!
Details
travis-ci/licence_check Success!
Details
travis-ci/littlefs Success! Code size is 8464B.
Details
travis-ci/psa-autogen Success!
Details
travis-ci/tools-py2.7 Success!
Details
travis-ci/tools-py3.5 Success!
Details
travis-ci/tools-py3.6 Success!
Details
travis-ci/tools-py3.7 Success!
Details
@0xc0170 0xc0170 removed the ready for merge label Sep 6, 2019
@adbridge

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

@JarkkoPaso please create a PR directly against the mbed-os-5.14 branch with these changes as they cannot be cherry picked across due to the strange merge commit.

@artokin

This comment has been minimized.

Copy link
Contributor

commented Sep 13, 2019

@adbridge , would you please try with:
git cherry-pick 396dae52ab4eef15910011432f2c7a4261fc22b7 following
git cherry-pick -m 1 4ebbbc592d52d834b439c438d9c699a3c7e62cbd
and finally git commit --allow-empty. This seems to merge the commits to Mbed OS 5.14 branch.

cc: @kjbracey-arm , would you have any other trick to do this?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.