I'm having a problem merging the Mesh SDK v1.0.1 with nRF5 SDK 14.2 following the "Coexistence with other Nordic SDKs" section of the Mesh documentation. I have a fresh unzip of the Mesh SDK and a fresh unzip of the nRF5 SDK both unaltered in any way. The issue is with the SDK patch process,
I execute the following command:
MacBook-Pro: ~/dev/nordic_semi/nRF5_SDK14.2.0_Mesh_SDK1.0.1 $ patch -p3 < ./examples/ble_mesh/external/nRF5_SDK_14.2.0_17b948a/nRF5_SDK_14.2.0_17b948a.patch
With the following shell failure output:
(Stripping trailing CRs from patch.)
patching file components/boards/pca10056.h
Hunk #1 FAILED at 53.
1 out of 1 hunk FAILED -- saving rejects to file components/boards/pca10056.h.rej
(Stripping trailing CRs from patch.)
patching file components/device/compiler_abstraction.h
Hunk #1 FAILED at 115.
1 out of 1 hunk FAILED -- saving rejects to file components/device/compiler_abstraction.h.rej
(Stripping trailing CRs from patch.)
patching file components/drivers_nrf/hal/nrf_gpio.h
Hunk #1 FAILED at 42.
1 out of 1 hunk FAILED -- saving rejects to file components/drivers_nrf/hal/nrf_gpio.h.rej
(Stripping trailing CRs from patch.)
patching file components/toolchain/arm/arm_startup_nrf51.s
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file components/toolchain/arm/arm_startup_nrf51.s.rej
(Stripping trailing CRs from patch.)
patching file components/toolchain/arm/arm_startup_nrf52.s
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file components/toolchain/arm/arm_startup_nrf52.s.rej
(Stripping trailing CRs from patch.)
patching file components/toolchain/arm/arm_startup_nrf52810.s
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file components/toolchain/arm/arm_startup_nrf52810.s.rej
(Stripping trailing CRs from patch.)
patching file components/toolchain/arm/arm_startup_nrf52840.s
Hunk #1 FAILED at 16.
1 out of 1 hunk FAILED -- saving rejects to file components/toolchain/arm/arm_startup_nrf52840.s.rej
I'm executing the patch from the MacOS command line in, the top level nRF5 SDK directory, with the Mesh SDK located under examples in a directory named ble_mesh as outlined in the documentation.
Can anyone help?
Thank you, Chris