Merge lwip 2.0.2 stable #4814

mikaleppanen · 2017-07-26T06:38:02Z

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

…f93f4..7648b58 git-subtree-dir: features/FEATURE_LWIP/lwip-interface/lwip git-subtree-split: 7648b58d03006bd60b9592f1853c167bf52b0193

* commit '7bbc850309fed8bf63017821f18aff03bca9233b': Squashed 'features/FEATURE_LWIP/lwip-interface/lwip/' changes from 10f93f4..7648b58

mikaleppanen · 2017-07-26T06:39:10Z

@peknis01 please review the contributing.md.

0xc0170 · 2017-07-26T08:33:31Z

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

@AnotherButler Please review the contributing document.

AnotherButler

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

AnotherButler · 2017-07-26T16:26:08Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+    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.


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".

AnotherButler · 2017-07-26T16:27:05Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `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


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 implies that you want "in mbed OS the master branch". I think " in the mbed OS master branch" is the more common form.

AnotherButler · 2017-07-26T16:28:41Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+# 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.


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

AnotherButler · 2017-07-26T20:32:18Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `e.g. git fetch lwip-fork`
+
+3. Do subtree pull for lwip prefixed branch in mbed OS root directory.


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".

AnotherButler · 2017-07-26T20:33:06Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `git clone [email protected]:ARMmbed/mbed-os.git`
+
+2. Go to mbed OS root directory and add mbed OS lwip fork repository as remote. Fetch branches from fork.


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".

AnotherButler · 2017-07-27T16:18:35Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+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>).


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

AnotherButler · 2017-07-27T16:19:32Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+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.


Please change "lwip_ prefix" to "the lwip_ prefix".

Please change "then" to "them".

Please change "mbed OS" to "the mbed OS".

AnotherButler · 2017-07-27T16:20:27Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+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


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."

AnotherButler · 2017-07-27T16:20:50Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+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 


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

AnotherButler · 2017-07-27T16:21:46Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

@@ -0,0 +1,129 @@
+# Description
+
+This document describes how to update mbed OS lwip stack. Mbed OS lwip stack is a copy of


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."

0xc0170 · 2017-07-31T13:19:55Z

@mikaleppanen Any update to the review?

mikaleppanen · 2017-08-01T07:52:42Z

Corrected CONTRIBUTING.md review defects.

0xc0170 · 2017-08-02T13:50:51Z

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.

AnotherButler · 2017-08-02T14:24:30Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `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.


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

AnotherButler · 2017-08-02T14:30:29Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    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.


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

AnotherButler · 2017-08-02T14:33:33Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

@@ -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.


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".

AnotherButler · 2017-08-02T14:34:09Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+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.


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

AnotherButler · 2017-08-02T14:34:39Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+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).


Please change "The mbed OS" to "The Mbed OS".

Please put "ARMmbed" in code format.

AnotherButler · 2017-08-02T14:41:42Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `e.g. git push origin mbed-os-lwip-stable-2_0_2-prefixed`
+
+### Merging the prefixed release to the mbed OS repository


Please change "mbed" to "Mbed".

AnotherButler · 2017-08-02T14:41:51Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+### Merging the prefixed release to the mbed OS repository
+
+1. Clone the mbed OS repository.


Please change "mbed" to "Mbed".

AnotherButler · 2017-08-02T14:42:20Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `git clone [email protected]: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.


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

AnotherButler · 2017-08-02T14:42:29Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `e.g. git fetch lwip-fork`
+
+3. Do a subtree pull for LWIP prefixed branch in the mbed OS root directory.


Please change "mbed" to "Mbed".

AnotherButler · 2017-08-02T14:43:05Z

features/FEATURE_LWIP/lwip-interface/CONTRIBUTING.md

+
+    `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.


Please change "mbed" to "Mbed".

mikaleppanen · 2017-08-03T08:56:27Z

Corrected CONTRIBUTING.md to new mbed style.

AnotherButler

@mikaleppanen Thanks so much. LGTM 👍

0xc0170 · 2017-08-03T16:41:10Z

/morph test-nightly

mbed-bot · 2017-08-04T04:15:04Z

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 934

Test failed!

0xc0170 · 2017-08-06T09:44:12Z

/morph test-nightly

0xc0170 · 2017-08-06T16:14:43Z

/morph test-nightly

studavekar · 2017-08-07T06:58:16Z

/morph test-nightly

mbed-bot · 2017-08-07T15:12:11Z

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 947

Test failed!

theotherjimmy · 2017-08-07T15:23:49Z

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

studavekar · 2017-08-07T16:45:44Z

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

/morph test-nightly

mbed-bot · 2017-08-08T01:02:51Z

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 959

Build failed!

0xc0170 · 2017-08-08T13:27:41Z

/morph test-nightly

mbed-bot · 2017-08-08T20:30:57Z

Result: FAILURE

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

/morph test-nightly

Output

mbed Build Number: 966

Build Prep failed!

studavekar · 2017-08-08T21:14:07Z

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 · 2017-08-09T05:12:15Z

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!

adbridge · 2017-08-11T12:12:14Z

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.

Mika Leppänen added 2 commits July 24, 2017 13:17

Squashed 'features/FEATURE_LWIP/lwip-interface/lwip/' changes from 10…

7bbc850

…f93f4..7648b58 git-subtree-dir: features/FEATURE_LWIP/lwip-interface/lwip git-subtree-split: 7648b58d03006bd60b9592f1853c167bf52b0193

Merged lwip 2.0.2 stable

844e400

* commit '7bbc850309fed8bf63017821f18aff03bca9233b': Squashed 'features/FEATURE_LWIP/lwip-interface/lwip/' changes from 10f93f4..7648b58

0xc0170 added the needs: review label Jul 26, 2017

theotherjimmy changed the title ~~Merged lwip 2.0.2 stable~~ Merge lwip 2.0.2 stable Jul 27, 2017

AnotherButler reviewed Jul 27, 2017

View reviewed changes

SeppoTakalo approved these changes Aug 1, 2017

View reviewed changes

AnotherButler reviewed Aug 2, 2017

View reviewed changes

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

Added contributing document.

02069f1

AnotherButler approved these changes Aug 3, 2017

View reviewed changes

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

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

theotherjimmy merged commit 4e30b96 into ARMmbed:master Aug 10, 2017

theotherjimmy added release-version: 5.5.5 and removed ready for merge labels Aug 10, 2017

adbridge added release-version: 5.6.0 and removed release-version: 5.5.5 labels Aug 11, 2017

geky mentioned this pull request Feb 23, 2018

littlefs: Update to version 1.3 #6179

Merged

6 tasks


		`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


		`e.g. git fetch lwip-fork`

		3. Do subtree pull for lwip prefixed branch in mbed OS root directory.


		`git clone [email protected]:ARMmbed/mbed-os.git`

		2. Go to mbed OS root directory and add mbed OS lwip fork repository as remote. Fetch branches from fork.

		@@ -0,0 +1,129 @@
		# Description

		This document describes how to update mbed OS lwip stack. Mbed OS lwip stack is a copy of


		`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.


		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.

		@@ -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 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.


		`e.g. git push origin mbed-os-lwip-stable-2_0_2-prefixed`

		### Merging the prefixed release to the mbed OS repository


		### Merging the prefixed release to the mbed OS repository

		1. Clone the mbed OS repository.


		`git clone [email protected]: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.


		`e.g. git fetch lwip-fork`

		3. Do a subtree pull for LWIP prefixed branch in the mbed OS root directory.

Merge lwip 2.0.2 stable #4814

Merge lwip 2.0.2 stable #4814

Uh oh!

Conversation

mikaleppanen commented Jul 26, 2017

Description

Status

Migrations

Related PRs

Todos

Deploy notes

Uh oh!

mikaleppanen commented Jul 26, 2017

Uh oh!

0xc0170 commented Jul 26, 2017

Uh oh!

AnotherButler left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented Jul 31, 2017

Uh oh!

mikaleppanen commented Aug 1, 2017

Uh oh!

0xc0170 commented Aug 2, 2017

Uh oh!

AnotherButler left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!