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

Merge lwip 2.0.2 stable #4814

Merged
merged 3 commits into from Aug 10, 2017

Conversation

Projects
None yet
8 participants
@mikaleppanen
Contributor

mikaleppanen commented Jul 26, 2017

Description

Merged lwIP 2.0.2 release to mbed OS. See http://savannah.nongnu.org/projects/lwip.
Added contributing.md with instructions how to integrate lwIP release to mbed OS
tree structure.

Tested with following combinations:
mbed-os-example-client application: ipv4 ethernet, ipv6 ethernet and ipv4 wlan.
mbed-os-cellular-example application: ipv4

Status

READY

Migrations

NO

Related PRs

None

Todos

  • Tests
  • Documentation

Deploy notes

None

mikaleppanen added some commits Jul 24, 2017

Squashed 'features/FEATURE_LWIP/lwip-interface/lwip/' changes from 10…
…f93f4..7648b58

git-subtree-dir: features/FEATURE_LWIP/lwip-interface/lwip
git-subtree-split: 7648b58d03006bd60b9592f1853c167bf52b0193
Merged lwip 2.0.2 stable
* commit '7bbc850309fed8bf63017821f18aff03bca9233b':
  Squashed 'features/FEATURE_LWIP/lwip-interface/lwip/' changes from 10f93f4..7648b58
@mikaleppanen

This comment has been minimized.

Contributor

mikaleppanen commented Jul 26, 2017

@peknis01 please review the contributing.md.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jul 26, 2017

@mikaleppanen Thanks for the document describing the lwip update process 👍

@AnotherButler Please review the contributing document.

@theotherjimmy theotherjimmy changed the title from Merged lwip 2.0.2 stable to Merge lwip 2.0.2 stable Jul 27, 2017

@AnotherButler

@0xc0170 I've left my suggested changes. Please note that most of them involve adding articles and changing passive to active voice.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
After this step there should be a new commit visible is mbed OS master branch that contains
the changes.
4. Verify that changes in new commit are correct, create a new branch push branch to your mbed-os fork for github review.

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please change "new commit" to "the new commit".
  • Please change "create" to "and create".
  • Please put "mbed-os" in code format.
  • Please capitalize the "g" and "h" in "GitHub".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git subtree pull --squash -P features/FEATURE_LWIP/lwip-interface/lwip lwip-fork mbed-os-lwip-stable-2_0_2-prefixed -m "Merged lwip 2.0.2 stable"`
After this step there should be a new commit visible is mbed OS master branch that contains

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please add a comma after "step".
  • Please change "should be" to "is".
  • Please change "is mbed" to "in mbed".
  • Please change "master branch" to "the master branch".

This comment has been minimized.

@theotherjimmy

theotherjimmy Jul 27, 2017

Contributor

This implies that you want "in mbed OS the master branch". I think " in the mbed OS master branch" is the more common form.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
# Description
This document describes how to update mbed OS lwip stack. Mbed OS lwip stack is a copy of
lwip master repository. Stack is located in `FEATURE_LWIP/lwip-interface/lwip` directory.

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor

Please put all paragraphs on one line because they don't always render properly when they're split like this.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git fetch lwip-fork`
3. Do subtree pull for lwip prefixed branch in mbed OS root directory.

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please change "subtree pull" to "a subtree pull".
  • Please either capitalize "LWIP" to put it in code format.
  • Please change "mbed OS root directory" to "the mbed OS root directory".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`git clone git@github.com:ARMmbed/mbed-os.git`
2. Go to mbed OS root directory and add mbed OS lwip fork repository as remote. Fetch branches from fork.

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please change "mbed OS root directory" to "the mbed OS root directory".
  • Please add comma after "directory".
  • Please change "mbed OS lwip fork repository" to "the mbed OS LWIP fork repository".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
fetched via mbed OS lwip fork repository. Repository is used to rename lwip source files
with `lwip_` prefix to make then compatible with mbed OS build system.
* Lwip master repository is under lwip project (<https://git.savannah.nongnu.org/git/lwip.git>).

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor

Please change to "The LWIP master repository is part of the LWIP project."

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
When new releases or single commits are added from lwip master repository they need to be
fetched via mbed OS lwip fork repository. Repository is used to rename lwip source files
with `lwip_` prefix to make then compatible with mbed OS build system.

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please change "lwip_ prefix" to "the lwip_ prefix".
  • Please change "then" to "them".
  • Please change "mbed OS" to "the mbed OS".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
This document describes how to update mbed OS lwip stack. Mbed OS lwip stack is a copy of
lwip master repository. Stack is located in `FEATURE_LWIP/lwip-interface/lwip` directory.
When new releases or single commits are added from lwip master repository they need to be

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor

Please change the first sentence to "When you add new releases or single commits from the LWIP master repository, you must fetch them using the mbed OS LWIP fork repository."

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
lwip master repository. Stack is located in `FEATURE_LWIP/lwip-interface/lwip` directory.
When new releases or single commits are added from lwip master repository they need to be
fetched via mbed OS lwip fork repository. Repository is used to rename lwip source files

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor

Please change start of second sentence to "Use the repository to rename LWIP source files".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
@@ -0,0 +1,129 @@
# Description
This document describes how to update mbed OS lwip stack. Mbed OS lwip stack is a copy of

This comment has been minimized.

@AnotherButler

AnotherButler Jul 27, 2017

Contributor
  • Please change "mbed OS lwip stack" to "the mbed OS LWIP stack".
  • Please change the second sentence to "The mbed OS LWIP stack is a copy of the LWIP master repository."

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 1, 2017

Contributor

Corrected.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jul 31, 2017

@mikaleppanen Any update to the review?

@mikaleppanen mikaleppanen force-pushed the mikaleppanen:lwip_2_0_2_stable branch 4 times, most recently Aug 1, 2017

@mikaleppanen

This comment has been minimized.

Contributor

mikaleppanen commented Aug 1, 2017

Corrected CONTRIBUTING.md review defects.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 2, 2017

Thanks @mikaleppanen

@AnotherButler All fine now?

@AnotherButler

Due to the new branding rollout that started yesterday, most instances of "mbed" need to change to "Mbed". Please note that some cases must remain lower case because they refer to the repo or other code. This is why I've called out all the instances that must change instead of suggesting you do a find and replace all.

I also left two minor comments not related to the new branding.

@0xc0170 I'm sorry we have to change this. I know y'all want to get this in quickly.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git branch mbed-os-lwip-stable-2_0_2 STABLE-2_0_2_RELEASE_VER`
5. Push the branch to the mbed OS LWIP fork repository to keep the fork in sync.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

I just noticed there are two 5s here. Please fix the numbering.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
After this step, there is a new commit visible in the mbed OS master branch that contains the changes.
4. Verify that changes in the new commit are correct and create a new branch. Push the branch to your mbed OS fork for GitHub review.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please add a comma after "correct" because two independent clauses connected by a coordinating conjunction require a comma after the first independent clause.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
@@ -0,0 +1,118 @@
# Description
This document describes how to update the mbed OS LWIP stack. The mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `FEATURE_LWIP/lwip-interface/lwip` directory.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Yesterday, Arm rolled out new branding guidelines. To reflect these changes please change "update the mbed OS" to update the Arm Mbed OS". In the second sentence, please change "mbed" to "Mbed".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
This document describes how to update the mbed OS LWIP stack. The mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `FEATURE_LWIP/lwip-interface/lwip` directory.
When you add new releases or single commits from the LWIP master repository, you must fetch them using the mbed OS LWIP fork repository. Use the repository to rename LWIP source files with the `lwip_` prefix to make them compatible with the mbed OS build system.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed" both times in this line to reflect the new branding rollout.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
When you add new releases or single commits from the LWIP master repository, you must fetch them using the mbed OS LWIP fork repository. Use the repository to rename LWIP source files with the `lwip_` prefix to make them compatible with the mbed OS build system.
* The LWIP master repository is part of the [LWIP project](https://savannah.nongnu.org/projects/lwip).
* The mbed OS LWIP fork repository is part of [ARMmbed](https://github.com/ARMmbed/lwip).

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor
  • Please change "The mbed OS" to "The Mbed OS".
  • Please put "ARMmbed" in code format.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git push origin mbed-os-lwip-stable-2_0_2-prefixed`
### Merging the prefixed release to the mbed OS repository

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
### Merging the prefixed release to the mbed OS repository
1. Clone the mbed OS repository.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`git clone git@github.com:ARMmbed/mbed-os.git`
2. Go to the mbed OS root directory, and add the mbed OS LWIP fork repository as remote. Fetch branches from fork.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed" both times in this line.

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git fetch lwip-fork`
3. Do a subtree pull for LWIP prefixed branch in the mbed OS root directory.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md Outdated
`e.g. git subtree pull --squash -P features/FEATURE_LWIP/lwip-interface/lwip lwip-fork mbed-os-lwip-stable-2_0_2-prefixed -m "Merged lwip 2.0.2 stable"`
After this step, there is a new commit visible in the mbed OS master branch that contains the changes.

This comment has been minimized.

@AnotherButler

AnotherButler Aug 2, 2017

Contributor

Please change "mbed" to "Mbed".

This comment has been minimized.

@mikaleppanen

mikaleppanen Aug 3, 2017

Contributor

Corrected.

@0xc0170 0xc0170 added needs: work and removed needs: review labels Aug 2, 2017

@mikaleppanen mikaleppanen force-pushed the mikaleppanen:lwip_2_0_2_stable branch to 02069f1 Aug 3, 2017

@mikaleppanen

This comment has been minimized.

Contributor

mikaleppanen commented Aug 3, 2017

Corrected CONTRIBUTING.md to new mbed style.

@AnotherButler

@mikaleppanen Thanks so much. LGTM 👍

@0xc0170 0xc0170 added needs: CI and removed needs: work labels Aug 3, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 3, 2017

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 4, 2017

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 934

Test failed!

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 6, 2017

/morph test-nightly

2 similar comments
@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 6, 2017

/morph test-nightly

@studavekar

This comment has been minimized.

Collaborator

studavekar commented Aug 7, 2017

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 7, 2017

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 947

Test failed!

@theotherjimmy

This comment has been minimized.

Contributor

theotherjimmy commented Aug 7, 2017

@studavekar It looks like the Arch PRO fell off. Could you give it a check?

@studavekar

This comment has been minimized.

Collaborator

studavekar commented Aug 7, 2017

Looks like ARM_BEETLE_SOC failed may be related to serial driver issue and we have fixed it.

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 8, 2017

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 959

Build failed!

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 8, 2017

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 8, 2017

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 966

Build Prep failed!

@studavekar

This comment has been minimized.

Collaborator

studavekar commented Aug 8, 2017

Error in git checkout

15:17:12  > git checkout -f 4a99b3bbbc9d87e0b3c006e50e517d8f47ec1e07
15:27:12 ERROR: Timeout after 10 minutes
15:27:19 FATAL: Could not checkout 4a99b3bbbc9d87e0b3c006e50e517d8f47ec1e07
15:27:20 hudson.plugins.git.GitException: Command "git checkout -f 4a99b3bbbc9d87e0b3c006e50e517d8f47ec1e07" returned status code -1:
15:27:20 stdout: 

/morph test-nightly

@mbed-bot

This comment has been minimized.

mbed-bot commented Aug 9, 2017

Result: SUCCESS

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

/morph test-nightly

Output

mbed Build Number: 969

All builds and test passed!

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

@theotherjimmy theotherjimmy merged commit 4e30b96 into ARMmbed:master Aug 10, 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
@adbridge

This comment has been minimized.

Contributor

adbridge commented Aug 11, 2017

The squash commit is now causing us issues with porting to 5.5.5 because it contains changes which were already backported to 5.5.4! ie it is based on an older codebase!! I'm not sure why the PR to master didn't complain! This is the kind of problem we see with squashing!!

I've spent 2 hours trying to manually apply this PR afterwards with little success due to the nasty and multiple conflicts that are coming up, thus this is not being backported.

@geky geky referenced this pull request Feb 23, 2018

Merged

littlefs: Update to version 1.3 #6179

6 of 6 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment