diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rwxr-xr-x | docker/build.sh | 12 | ||||
| -rwxr-xr-x | docker/post_build.sh.in (renamed from docker/build.sh.in) | 11 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
4 files changed, 16 insertions, 11 deletions
@@ -3,4 +3,4 @@ cmake-build-* core sdk src/Version.h -docker/build.sh +docker/post_build.sh diff --git a/docker/build.sh b/docker/build.sh new file mode 100755 index 00000000..fcb819a6 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,12 @@ +#!/bin/sh +export LC_ALL=C.UTF-8 +export LANG=C.UTF-8 +set -x + +mkdir /sources/build +cd /sources/build + +cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -DUSE_OPENOCD=1 ../ +make -j$(nproc) + +sh /sources/docker/post_build.sh diff --git a/docker/build.sh.in b/docker/post_build.sh.in index a5940e73..f5bf32fa 100755 --- a/docker/build.sh.in +++ b/docker/post_build.sh.in @@ -3,15 +3,9 @@ export LC_ALL=C.UTF-8 export LANG=C.UTF-8 set -x -mkdir /sources/build -cd /sources/build - -cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -DUSE_OPENOCD=1 ../ -make -j$(nproc) - mkdir -p /sources/build/output -/opt/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header /sources/build/src/@EXECUTABLE_MCUBOOT_FILE_NAME@.bin /sources/build/output/@IMAGE_MCUBOOT_FILE_NAME@ -adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application /sources/build/output/@IMAGE_MCUBOOT_FILE_NAME@ /sources/build/output/@DFU_FILE_NAME@ +/opt/mcuboot/scripts/imgtool.py create --align 4 --version 1.0.0 --header-size 32 --slot-size 475136 --pad-header /sources/build/src/pinetime-mcuboot-app-0.8.0.bin /sources/build/output/image-0.8.0.bin +adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application /sources/build/output/image-0.8.0.bin /sources/build/output/dfu-0.8.0.zip cp /sources/build/src/*.bin /sources/build/output/ cp /sources/build/src/*.hex /sources/build/output/ @@ -20,4 +14,3 @@ cp /sources/build/src/*.map /sources/build/output/ cp /sources/bootloader/mynewt_nosemi_4.1.7.elf.bin /sources/build/output/bootloader.bin - diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9bd81842..63bb0591 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -721,4 +721,4 @@ elseif(USE_OPENOCD) endif() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../docker/build.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/../docker/build.sh) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../docker/post_build.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/../docker/post_build.sh) |