Skip to content

Nanostack libservice #4235

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
May 15, 2017
Merged

Nanostack libservice #4235

merged 5 commits into from
May 15, 2017

Conversation

SeppoTakalo
Copy link
Contributor

Description

  • Update Nanostack-libservice module from master

NOTE: Added as a git-subtree, this should be merged, not cherry-picked

Status

READY

Related PRs

Seppo Takalo added 3 commits April 27, 2017 15:15
Remove libservice, to be added as a subtree
210508b
Squashed 'features/FEATURE_COMMON_PAL/nanostack-libservice/' content …
8d65f6d 
…from commit 67affc61b

git-subtree-dir: features/FEATURE_COMMON_PAL/nanostack-libservice
git-subtree-split: 67affc61b209786b745afc3026e76dec6aa94fd2
Merge commit '8d65f6d10a610bd4305528f7338e081059a93fb8' as 'features/…
fb91d73 
…FEATURE_COMMON_PAL/nanostack-libservice'
@0xc0170
Copy link
Contributor

0xc0170 commented Apr 28, 2017 •
edited
Loading

NOTE: Added as a git-subtree, this should be merged, not cherry-picked

@adbridge This shall be run through the release script, to make it work !

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 28, 2017

@SeppoTakalo just to be certain, looking at the changes, this shall go to the next minor?

@SeppoTakalo
Copy link
Contributor Author

Yes.

@adbridge
Copy link
Contributor

adbridge commented May 2, 2017 •
edited
Loading

@0xc0170

@adbridge This shall be run through the release script, to make it work !

If it's going to the next minor ie 5.5.0 then it won't go through the release script as it will go directly into the new branch.

@0xc0170
Copy link
Contributor

0xc0170 commented May 2, 2017

/morph test-nightly

@SeppoTakalo
Copy link
Contributor Author

SeppoTakalo commented May 2, 2017 •
edited
Loading

Oh.. actually.. this can go to patch release, not minor. My bad, sorry.

There is no API changes, but deprecated old APIs have been removed.

@theotherjimmy
Copy link
Contributor

@SeppoTakalo As far as I know, we remove deprecated stuff in 5.*.0 releases.

@tommikas tommikas mentioned this pull request May 2, 2017
Merged
@mbed-bot
Copy link

mbed-bot commented May 2, 2017

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 125

Example Build failed!

@bridadan
Copy link
Contributor

bridadan commented May 2, 2017

Looks like there's a missing definition of the function common_count_leading_zeros for IAR? Check the jenkins build for more info.

@SeppoTakalo
Copy link
Contributor Author

Argh.. Actually, looks like this is a binary break.
Even that those functions are inlined, they are not forced to be. Therefore those rare cases where compiler did not inline them, this will break the linking because the common_count_leading_zeros() is renamed to common_count_leading_zeros_8()

Looks like we need to rework this and probably provide both, new and old API and deprecate them later.

@theotherjimmy
Copy link
Contributor

@SeppoTakalo What's your plan here? Should we expect this PR to be updated? or are you going to submit another one?

Seppo Takalo added 2 commits May 11, 2017 13:38
Squashed 'features/FEATURE_COMMON_PAL/nanostack-libservice/' changes …
1d3c49a 
…from 67affc61b..6444c8a4f

6444c8a4f Restore common_count_leading_zeros definition

git-subtree-dir: features/FEATURE_COMMON_PAL/nanostack-libservice
git-subtree-split: 6444c8a4f23dfe6d9b28014c78b41812879898b9
Merge commit '1d3c49a408faa231d18d83fb03c65425cf22c507' into nanostac…
bb7eeca 
…k-libservice

* commit '1d3c49a408faa231d18d83fb03c65425cf22c507':
  Squashed 'features/FEATURE_COMMON_PAL/nanostack-libservice/' changes from 67affc61b..6444c8a4f
@SeppoTakalo
Copy link
Contributor Author

Sorry for the long delay, this task has not been on my backlog.

Pulled in latest change from libservice that restores the backward compatibility of common_count_leading_zeros() so not a breaking change any more.

@0xc0170
Copy link
Contributor

0xc0170 commented May 11, 2017

/morph test-nightly

@mbed-bot
Copy link

Result: SUCCESS

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

/morph test-nightly

Output

mbed Build Number: 187

All builds and test passed!

@0xc0170 0xc0170 merged commit 07c8b21 into master May 15, 2017
@adbridge
Copy link
Contributor

This cannot be patched across to 5.4 due to the large merge commit, relabeling this for 5.5

@kjbracey
Copy link
Contributor

kjbracey commented May 19, 2017 •
edited
Loading

The merge visible on master is just a subtree maintenance artifact, and isn't a factor for patching - the commit could be cherry-picked fine using git cherry-pick -m 1 07cb821.

But I agree that it's for 5.5, as per previous discussion.

@0xc0170 0xc0170 deleted the nanostack-libservice branch June 27, 2018 13:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@kjbracey kjbracey kjbracey approved these changes

@tommikas tommikas tommikas approved these changes

@sarahmarshy sarahmarshy Awaiting requested review from sarahmarshy

Assignees
No one assigned
Labels
release-version: 5.5.0-rc1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@SeppoTakalo @0xc0170 @adbridge @theotherjimmy @mbed-bot @bridadan @kjbracey @tommikas