mirror of https://github.com/ARMmbed/mbed-os.git
Merge pull request #13371 from gpsimenos/gp-lwip-restruct
Restructure lwipstack directorypull/13408/head
commit
1d362c8a7a
|
@ -8,8 +8,8 @@
|
|||
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
|
||||
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
|
||||
^features/frameworks
|
||||
^features/lwipstack/lwip
|
||||
^features/lwipstack/lwip-sys
|
||||
^connectivity/lwipstack/lwip
|
||||
^connectivity/lwipstack/lwip-sys
|
||||
^features/mbedtls
|
||||
^features/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
|
||||
^features/nanostack/targets
|
||||
|
|
|
@ -250,7 +250,7 @@ matrix:
|
|||
- sed -n '/``` cpp/,/```/{/```$/Q;/```/d;p;}' ${EVENTS}/README.md > main.cpp
|
||||
- |
|
||||
rm -r rtos/source/TARGET_CORTEX drivers/source/usb connectivity/cellular connectivity/drivers/cellular \
|
||||
connectivity/libraries/ppp connectivity/netsocket features/nanostack features/lwipstack features/frameworks/greentea-client \
|
||||
connectivity/libraries/ppp connectivity/netsocket features/nanostack connectivity/lwipstack features/frameworks/greentea-client \
|
||||
features/frameworks/utest features/frameworks/unity components BUILD
|
||||
- python tools/make.py -t GCC_ARM -m NUCLEO_F103RB --source=. --build=BUILD/NUCLEO_F103RB/GCC_ARM -j0
|
||||
# Run profiling tests
|
||||
|
|
|
@ -13,7 +13,7 @@ Folders containing files under different permissive license than Apache 2.0 are
|
|||
- [features/FEATURE_PSA/FEATURE_MBED_PSA_SRV/services/attestation](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation) - BSD-3-Clause
|
||||
- [features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor](./features/FEATURE_PSA/TARGET_MBED_PSA_SRV/services/attestation/qcbor) - BSD-3-Clause
|
||||
- [features/lorawan](./features/lorawan) - Revised BSD
|
||||
- [features/lwipstack](./features/lwipstack) - BSD-style, MIT-style
|
||||
- [connectivity/lwipstack](./connectivity/lwipstack) - BSD-style, MIT-style
|
||||
- [features/nanostack/sal-stack-nanostack](./features/nanostack/sal-stack-nanostack) - BSD-3-Clause
|
||||
- [features/frameworks/unity/unity](./features/frameworks/unity/unity) - MIT
|
||||
- [features/unsupported](./features/unsupported) - MIT-style, BSD-style
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Description
|
||||
|
||||
This document describes how to update the Arm Mbed OS LWIP stack. The Mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `features/lwipstack/lwip` directory.
|
||||
This document describes how to update the Arm Mbed OS LWIP stack. The Mbed OS LWIP stack is a copy of the LWIP master repository. Stack is located in `connectivity/lwipstack/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.
|
||||
|
||||
|
@ -109,9 +109,9 @@ You can integrate a new release using the following steps.
|
|||
|
||||
3. Do a subtree pull for LWIP prefixed branch in the Mbed OS root directory.
|
||||
|
||||
`git subtree pull --squash -P features/lwipstack/lwip <remote name> <new prefixed branch> -m "<commit message>"`
|
||||
`git subtree pull --squash -P connectivity/lwipstack/lwip <remote name> <new prefixed branch> -m "<commit message>"`
|
||||
|
||||
`e.g. git subtree pull --squash -P features/lwipstack/lwip lwip-fork mbed-os-lwip-stable-2_0_2-prefixed -m "Merged lwip 2.0.2 stable"`
|
||||
`e.g. git subtree pull --squash -P connectivity/lwipstack/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.
|
||||
|
Before Width: | Height: | Size: 724 B After Width: | Height: | Size: 724 B |
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue