From a7df0a02799442ab38e1b365d4363cca6d93f029 Mon Sep 17 00:00:00 2001 From: Joe Eaves Date: Thu, 17 Dec 2020 13:12:06 +0000 Subject: Unify the Dockerfiles by fleshing out build.sh Script is written to handle it's own dependencies so it can be used within Docker or on the host system --- docker/post_build.sh.in | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'docker/post_build.sh.in') diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in index 0665100a..414fdb40 100755 --- a/docker/post_build.sh.in +++ b/docker/post_build.sh.in @@ -2,15 +2,24 @@ export LC_ALL=C.UTF-8 export LANG=C.UTF-8 set -x +set -e -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/pinetime-mcuboot-app-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.bin /sources/build/output/image-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.bin -adafruit-nrfutil dfu genpkg --dev-type 0x0052 --application /sources/build/output/image-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.bin /sources/build/output/dfu-@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@.zip +export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@" -cp /sources/build/src/*.bin /sources/build/output/ -cp /sources/build/src/*.hex /sources/build/output/ -cp /sources/build/src/*.out /sources/build/output/ -cp /sources/build/src/*.map /sources/build/output/ -cp /sources/bootloader/bootloader-5.0.4.bin /sources/build/output/bootloader.bin +mkdir -p "$OUTPUT_DIR" +"$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" +adafruit-nrfutil dfu genpkg --dev-type 0x0052 \ + --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \ + "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip" + +cp "$BUILD_DIR"/src/*.bin \ + "$BUILD_DIR"/src/*.hex \ + "$BUILD_DIR"/src/*.out \ + "$BUILD_DIR"/src/*.map \ + $OUTPUT_DIR +cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 6c6ffc61ee273ba29f2a094e9953dbaf3df920d6 Mon Sep 17 00:00:00 2001 From: Joe Eaves Date: Tue, 22 Dec 2020 11:39:21 +0000 Subject: Make the post_build output a little cleaner --- docker/post_build.sh.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'docker/post_build.sh.in') diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in index 414fdb40..52824c5b 100755 --- a/docker/post_build.sh.in +++ b/docker/post_build.sh.in @@ -7,6 +7,7 @@ set -e export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@" mkdir -p "$OUTPUT_DIR" +cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin "$TOOLS_DIR"/mcuboot/scripts/imgtool.py create --version 1.0.0 \ --align 4 --header-size 32 --slot-size 475136 --pad-header \ @@ -17,9 +18,9 @@ adafruit-nrfutil dfu genpkg --dev-type 0x0052 \ --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \ "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip" -cp "$BUILD_DIR"/src/*.bin \ - "$BUILD_DIR"/src/*.hex \ - "$BUILD_DIR"/src/*.out \ - "$BUILD_DIR"/src/*.map \ - $OUTPUT_DIR -cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin \ No newline at end of file +pushd "$BUILD_DIR" + cp src/*.bin $OUTPUT_DIR + cp src/*.hex $OUTPUT_DIR + cp src/*.out $OUTPUT_DIR + cp src/*.map $OUTPUT_DIR +popd \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 5cdd3f6e6f0abf439da0389b38ebc13bd30fc8e5 Mon Sep 17 00:00:00 2001 From: Joe Eaves Date: Tue, 22 Dec 2020 12:40:21 +0000 Subject: Improve the post_build again, again? --- docker/post_build.sh.in | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'docker/post_build.sh.in') diff --git a/docker/post_build.sh.in b/docker/post_build.sh.in index 52824c5b..53ae343a 100755 --- a/docker/post_build.sh.in +++ b/docker/post_build.sh.in @@ -1,12 +1,13 @@ #!/bin/sh export LC_ALL=C.UTF-8 export LANG=C.UTF-8 -set -x set -e +set +x export PROJECT_VERSION="@PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@" mkdir -p "$OUTPUT_DIR" + cp "$SOURCES_DIR"/bootloader/bootloader-5.0.4.bin $OUTPUT_DIR/bootloader.bin "$TOOLS_DIR"/mcuboot/scripts/imgtool.py create --version 1.0.0 \ @@ -18,9 +19,11 @@ adafruit-nrfutil dfu genpkg --dev-type 0x0052 \ --application "$OUTPUT_DIR/image-$PROJECT_VERSION.bin" \ "$OUTPUT_DIR/dfu-$PROJECT_VERSION.zip" -pushd "$BUILD_DIR" - cp src/*.bin $OUTPUT_DIR - cp src/*.hex $OUTPUT_DIR - cp src/*.out $OUTPUT_DIR - cp src/*.map $OUTPUT_DIR -popd \ No newline at end of file +mkdir -p "$OUTPUT_DIR/src" +cd "$BUILD_DIR" +cp src/*.bin "$OUTPUT_DIR/src" +cp src/*.hex "$OUTPUT_DIR/src" +cp src/*.out "$OUTPUT_DIR/src" +cp src/*.map "$OUTPUT_DIR/src" + +ls -RUv1 "$OUTPUT_DIR" | sed 's;^\([^/]\); \1;g' \ No newline at end of file -- cgit v1.2.3-70-g09d2