diff options
| author | NeroBurner <pyro4hell@gmail.com> | 2025-05-27 22:56:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-27 22:56:10 +0200 |
| commit | 6f2a661a363494ad6ba7ecdf3bf1807b9701b6ea (patch) | |
| tree | 92e481c3379e89bdc1d780b381b6542f11b050b5 /.idea/codeStyles | |
| parent | 9fb35cc073452d20a8c106693d86ffd332a85032 (diff) | |
docker: fix NRF_SDK download and subsequent build.sh (#2299)
The upstream NRF-SDK download url and zip archive filename changed,
which was fixed with https://github.com/InfiniTimeOrg/InfiniTime/pull/2270
But the archive contents stayed the same, with the "old" folder name.
After #2270 we have basically the same docker-container as before the PR,
but the `GetNrfSdk` function of the `build.sh` script is called again during
firmware build time as the expected foldername for the SDK isn't the same as
the zip filename:
```sh
[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ] && GetNrfSdk
```
Then during the build the `buils.sh` script tries to execute `GetNrfSdk` again,
which fails as the files already exist resulting in the following error:
```
replace /opt/nRF5_SDK_15.3.0_59ac345/components/802_15_4/api/HAL/hal_atomic.h? [y]es, [n]o, [A]ll, [N]one, [r]ename: NULL
```
Fix this by reverting the `NRF_SDK_VER` to the folder name in the zip
archive and by some character replacement generate the download URL from
the above (the download is in lower-case without the `_` and `.`
characters).
Furthermore add safeguards to check after the `GetNrfSdk` call if the
expected folder is really created. Then we have an error early during
container image creation if the contents of the zip-archive are
unexpected.
Diffstat (limited to '.idea/codeStyles')
0 files changed, 0 insertions, 0 deletions
