diff options
| author | JF <jf@codingfield.com> | 2021-03-07 18:45:35 +0100 |
|---|---|---|
| committer | Gitea <gitea@fake.local> | 2021-03-07 18:45:35 +0100 |
| commit | c5dc4c55a79e0e3393df22e77825f24b6130a0bb (patch) | |
| tree | 6f81eb191aa0c749cbef9b856d43ed4546302802 /docker | |
| parent | ada942535718d48eec37cca4f50d678e7201dc67 (diff) | |
| parent | 5845fd98ba68e12f1e57d50ed06abd7ccf47e029 (diff) | |
Merge branch 'recovery-firmware' of JF/PineTime into develop
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | docker/build.sh | 1 | ||||
| -rwxr-xr-x | docker/post_build.sh.in | 11 |
3 files changed, 7 insertions, 8 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 894e534b..a6caa24e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,7 +17,8 @@ RUN apt-get update -qq \ # aarch64 packages libffi-dev \ libssl-dev \ - python3-dev \ + python3-dev \ + python \ && rm -rf /var/cache/apt/* /var/lib/apt/lists/*; RUN pip3 install adafruit-nrfutil diff --git a/docker/build.sh b/docker/build.sh index 8f0d0fa9..2fa7d920 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -63,6 +63,7 @@ CmakeGenerate() { -DUSE_OPENOCD=1 \ -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_VER" \ -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \ + -DBUILD_DFU=1 \ "$SOURCES_DIR" cmake -L -N . } diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in index 53ae343a..db6e7a94 100755 --- a/docker/post_build.sh.in +++ b/docker/post_build.sh.in @@ -9,15 +9,12 @@ export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT mkdir -p "$OUTPUT_DIR" cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin +cp "$BUILD_DIR/src/pinetime-mcuboot-app-image-$PROJECT_VERSION.bin" "$OUTPUT_DIR/pinetime-mcuboot-app-image-$PROJECT_VERSION.bin" +cp "$BUILD_DIR/src/pinetime-mcuboot-app-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/pinetime-mcuboot-app-dfu-$PROJECT_VERSION.zip" -"$TOOLS_DIR"/mcuboot/scripts/imgtool.py create --version 1.0.0 \ - --align 4 --header-size 32 --slot-size 475136 --pad-header \ - "$BUILD_DIR/src/pinetime-mcuboot-app-$PROJECT_VERSION.bin" \ - "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" +cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-image-$PROJECT_VERSION.bin" +cp "$BUILD_DIR/src/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip" "$OUTPUT_DIR/pinetime-mcuboot-recovery-loader-dfu-$PROJECT_VERSION.zip" -adafruit-nrfutil dfu genpkg --dev-type 0x0052 \ - --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \ - "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip" mkdir -p "$OUTPUT_DIR/src" cd "$BUILD_DIR" |