Skip to content

Commit f3fb55e

Browse files
manifest: rebase OSS histories
Rewrite the history of extra patches in the nRF Connect SDK history for OSS repositories into a linear series of commits on top of the latest upstream merge-base. This is a regular step in the release process. Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
1 parent 162b4a1 commit f3fb55e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

west.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ manifest:
5050
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
5151
- name: zephyr
5252
repo-path: sdk-zephyr
53-
revision: v3.1.99-ncs1-snapshot1
53+
revision: 3afbbacd2ea218f0f203a1c45cb55d5f0eba2820
5454
import:
5555
# In addition to the zephyr repository itself, NCS also
5656
# imports the contents of zephyr/west.yml at the above
@@ -103,28 +103,28 @@ manifest:
103103
revision: 76bd09efa5424a4039a234a7244fe32fa495d9cf
104104
- name: mcuboot
105105
repo-path: sdk-mcuboot
106-
revision: v1.9.99-ncs2-snapshot1
106+
revision: 1d535d0ccbf4d213752a58b235e8e46c6a39a6a1
107107
path: bootloader/mcuboot
108108
- name: mbedtls-nrf
109109
path: mbedtls
110110
repo-path: sdk-mbedtls
111-
revision: v3.1.0-ncs1-rc1
111+
revision: cfc83308dd686c4e923e9f278afbdbda7e21af9a
112112
- name: nrfxlib
113113
repo-path: sdk-nrfxlib
114114
path: nrfxlib
115115
revision: ee0d1c66944f15a47d08883c4826b3b4b4cb317e
116116
- name: trusted-firmware-m
117117
repo-path: sdk-trusted-firmware-m
118118
path: modules/tee/tf-m/trusted-firmware-m
119-
revision: v1.6.0-ncs1-snapshot1
119+
revision: 43782540336a256fe24c28d5d6bf02d8e2b3a706
120120
- name: tfm-mcuboot # This is used by the trusted-firmware-m module.
121121
repo-path: sdk-mcuboot
122122
path: modules/tee/tfm-mcuboot
123123
revision: v1.7.2-ncs2-rc1
124124
- name: matter
125125
repo-path: sdk-connectedhomeip
126126
path: modules/lib/matter
127-
revision: v2.1.0-snapshot1
127+
revision: 5faaee50ed398de2109881d1aa5320f489131264
128128
submodules:
129129
- name: nlio
130130
path: third_party/nlio/repo

0 commit comments

Comments
 (0)