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 update for mbed-os-5.6 #4960

Merged
merged 8 commits into from Aug 29, 2017

Conversation

Projects
None yet
7 participants
@artokin
Contributor

artokin commented Aug 23, 2017

Notes:

  • Pull requests will not be accepted until the submitter has agreed to the contributer agreement.
  • This is just a template, so feel free to use/remove the unnecessary things

Description

Update nanostack for mbed-os-5.6 release:

  • Update Nanostack to v6.2.1 (was: v6.2.0).
  • Update coap-service as a subtree
  • Update eventloop as a subtree
  • Update mbed-trace as a subtree

Status

IN DEVELOPMENT

Migrations

If this PR changes any APIs or behaviors, give a short description of what API users should do when this PR is merged.

NO

This Nanostack release is backwards compatible.

Related PRs

List related PRs against other branches:

branch PR
other_pr_production link
other_pr_master link

Todos

  • [x ] Tests
  • Documentation

Deploy notes

Notes regarding the deployment of this PR. These should note any
required changes in the build environment, tools, compilers, etc.

Steps to test or reproduce

Outline the steps to test or reproduce the PR here.

artokin added some commits Aug 23, 2017

Update Nanostack to v6.2.0
Nanostack v6.2.0 will be used in mbed-os-5.6
Squashed 'features/nanostack/FEATURE_NANOSTACK/coap-service/' changes…
… from e125164..d65b6b0

d65b6b0 Update unittests for nsdynmemlib API change (#71)
bc69b8b Disable CoAP duplicate message detection (#69)
ccb65f8 Change year 2017 to copyright (#68)
76490a7 Add option to join COAP multicast group (#67)
381d910 Register to multicast groups (#66)
dce323c Add transaction delete to CoAP service (#65)
feea33e Add option to select used socket interface (#63)
5a5c0f9 Merge pull request #62 from ARMmbed/coap_separation
0d26c00 Modifying file headers and Makefile  to adapt from libcoap to mbed-coap
d323c3a Fixing unit tests based on new coap library
d1a3d25 Modifying Makefile and source file based on new coap library

git-subtree-dir: features/nanostack/FEATURE_NANOSTACK/coap-service
git-subtree-split: d65b6b0eb890be93f667debe8da83aa498021ccf
Merge commit '9d5a9f5a29d19b2e67402e4e452e13ce75baca7c'
* commit '9d5a9f5a29d19b2e67402e4e452e13ce75baca7c':
  Squashed 'features/nanostack/FEATURE_NANOSTACK/coap-service/' changes from e125164..d65b6b0
Merge commit 'dd2b0955ae955137785c1dc6587594ea2c5161c5'
* commit 'dd2b0955ae955137785c1dc6587594ea2c5161c5':
  Squashed 'features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/' changes from 1fc996d..be7cdd6
Squashed 'features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop/'…
… changes from 1fc996d..be7cdd6

be7cdd6 Merge pull request #34 from ARMmbed/yotta_fixes
9191f44 yotta-related fixes

git-subtree-dir: features/FEATURE_COMMON_PAL/sal-stack-nanostack-eventloop
git-subtree-split: be7cdd6bf4b1e9f4205e0ae5c54331488a33fb90
Squashed 'features/FEATURE_COMMON_PAL/mbed-trace/' changes from af5f5…
…9c..b731d95

b731d95 Clarify mutex type requirement (#77)
7c31aef bumb version number (#72)
75982fc fix dummydefine for mbed_trace_init (#71)
539b80c Update version number. (#69)
b0e09f9 output/ added to gitignore list (#66)
a5cce88 Added include_directories(${CMAKE_CURRENT_SOURCE_DIR}/) include to resolve compilation error for Linux. (#63)
d087dbb Ensure tr_array doesn't print <null> when len == 0 (#65)

git-subtree-dir: features/FEATURE_COMMON_PAL/mbed-trace
git-subtree-split: b731d954d111d92199b2a0402dc9a3d52f5d4a17
Merge commit '33b0820afc856ebe8808cb0a8c1071bc74780743'
* commit '33b0820afc856ebe8808cb0a8c1071bc74780743':
  Squashed 'features/FEATURE_COMMON_PAL/mbed-trace/' changes from af5f59c..b731d95
@SeppoTakalo

This comment has been minimized.

Contributor

SeppoTakalo commented Aug 23, 2017

@0xc0170 Please start tests for this.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 23, 2017

/morph test-nightly

@0xc0170 0xc0170 added the needs: CI label Aug 23, 2017

@adbridge

This comment has been minimized.

Contributor

adbridge commented Aug 23, 2017

@artokin PRs should not contain squashes or merge commits, these break our patch releases. If you wish this to be backported to 5.5.6 then please instead use rebase for your commits. If it is targeted for 5.6 then it is less of an issue...

@artokin

This comment has been minimized.

Contributor

artokin commented Aug 23, 2017

@adbridge , this PR is targeted to mbed-os-5.6.

@SeppoTakalo

This comment has been minimized.

Contributor

SeppoTakalo commented Aug 23, 2017

@adbridge Good point.

PR should specify:
Target: mbed OS 5.6

This is not to be backported to 5.5.x

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 23, 2017

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1096

Example Build failed!

@SeppoTakalo

This comment has been minimized.

Contributor

SeppoTakalo commented Aug 24, 2017

Can somebody explain the build failure:

Compile [ 68.7%]: irq_cm4f.S
[DEBUG] Compile: C:\Program Files (x86)\IAR Systems\Embedded Workbench 7.5\arm\bin\iasmarm --cpu Cortex-M7 --fpu VFPv5 -DTRANSACTION_QUEUE_SIZE_SPI=2 -D__CORTEX_M7 -DARM_MATH_CM7 -D__FPU_PRESENT=1 -DUSBHOST_OTHER -D__MBED_CMSIS_RTOS_CM -D__CMSIS_RTOS -f .\BUILD\NUCLEO_F767ZI\IAR\.includes_741ae50a4fb9e68fa715ca0da6ea3a3a.txt -o .\BUILD\NUCLEO_F767ZI\IAR\mbed-os\rtos\rtx5\TARGET_CORTEX_M\TARGET_RTOS_M4_M7\TOOLCHAIN_IAR\irq_cm4f.o .\mbed-os\rtos\rtx5\TARGET_CORTEX_M\TARGET_RTOS_M4_M7\TOOLCHAIN_IAR\irq_cm4f.S
[DEBUG] Return: 3
Traceback (most recent call last):
  File "C:\mj\workspace\bm_wrap\1189\examples\mbed-os-example-mesh-minimal\mbed-os\tools\make.py", line 296, in <module>
    stats_depth=options.stats_depth)
  File "C:\mj\workspace\bm_wrap\1189\examples\mbed-os-example-mesh-minimal\mbed-os\tools\build_api.py", line 539, in build_project
    objects = toolchain.compile_sources(resources, resources.inc_dirs)
  File "C:\mj\workspace\bm_wrap\1189\examples\mbed-os-example-mesh-minimal\mbed-os\tools\toolchains\__init__.py", line 922, in compile_sources
    return self.compile_queue(queue, objects)
  File "C:\mj\workspace\bm_wrap\1189\examples\mbed-os-example-mesh-minimal\mbed-os\tools\toolchains\__init__.py", line 985, in compile_queue
    raise ToolException(err)
ToolException
[mbed] Working path "C:\mj\workspace\bm_wrap\1189\examples\mbed-os-example-mesh-minimal" (program)
@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Aug 24, 2017

@SeppoTakalo That's an internal IAR error that we are trying to root cause ATM: #4879.

Update Nanostack to v6.2.1
v6.2.1 targeted to mbed OS 5.6 release.
@studavekar

This comment has been minimized.

Collaborator

studavekar commented Aug 28, 2017

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 29, 2017

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1128

All builds and test passed!

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Aug 29, 2017

@theotherjimmy theotherjimmy merged commit 4978a08 into ARMmbed:master Aug 29, 2017

4 checks passed

Cam-CI uvisor Build & Test Success
Details
ci/morph-test-nightly Job has completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

kegilbert added a commit to kegilbert/mbed-os that referenced this pull request Nov 14, 2017

Merge pull request ARMmbed#4960 from artokin/master
Nanostack update for mbed-os-5.6

kegilbert added a commit to kegilbert/mbed-os that referenced this pull request Dec 14, 2017

Merge pull request ARMmbed#4960 from artokin/master
Nanostack update for mbed-os-5.6

kegilbert added a commit to kegilbert/mbed-os that referenced this pull request Jan 25, 2018

Merge pull request ARMmbed#4960 from artokin/master
Nanostack update for mbed-os-5.6

kegilbert added a commit to kegilbert/mbed-os that referenced this pull request Feb 26, 2018

Merge pull request ARMmbed#4960 from artokin/master
Nanostack update for mbed-os-5.6

kegilbert added a commit to kegilbert/mbed-os that referenced this pull request Nov 20, 2018

Merge pull request ARMmbed#4960 from artokin/master
Nanostack update for mbed-os-5.6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment