diff --git a/firmware/config/boards/common_script.sh b/firmware/config/boards/common_script.sh index 8c5b6b916f..014e859efd 100644 --- a/firmware/config/boards/common_script.sh +++ b/firmware/config/boards/common_script.sh @@ -52,12 +52,13 @@ if [ "$USE_OPENBLT" = "yes" ]; then #cp build/rusefi.hex deliver/rusefi_update.hex # bootloader and composite image - echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT" - $HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu +# echo "$SCRIPT_NAME: invoking hex2dfu for OpenBLT" +# $HEX2DFU -i bootloader/blbuild/openblt_$PROJECT_BOARD.hex -o bootloader/blbuild/openblt_$PROJECT_BOARD.dfu +# todo: no need for complex `PROJECT = openblt_$(PROJECT_BOARD)` and complex binary name if we copy into static file name anyway! # do we need all these formats? cp bootloader/blbuild/openblt_$PROJECT_BOARD.bin deliver/openblt.bin - cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu +# cp bootloader/blbuild/openblt_$PROJECT_BOARD.dfu deliver/openblt.dfu #cp bootloader/blbuild/openblt_$PROJECT_BOARD.hex deliver/openblt.hex echo "$SCRIPT_NAME: invoking hex2dfu for composite rusEFI+OpenBLT image" diff --git a/misc/jenkins/build_working_folder.sh b/misc/jenkins/build_working_folder.sh index b4262ff9a8..0b7667e4e3 100755 --- a/misc/jenkins/build_working_folder.sh +++ b/misc/jenkins/build_working_folder.sh @@ -71,7 +71,6 @@ mkdir -p artifacts rm -rf artifacts/* mkdir $update_ts_cacerts_FOLDER -ls -l $FOLDER if [ -z $RUSEFI_CONSOLE_SETTINGS ]; then echo "$SCRIPT_NAME: No rusefi_console_settings" @@ -103,10 +102,15 @@ fi # bootloader [ -e firmware/deliver/openblt.bin ] && { cp firmware/deliver/openblt.bin $FOLDER ; } -if [ "$USE_OPENBLT" = "yes" ]; then +# USE_OPENBLT is not available this script is invoked as a separate GHA step +if [ -f firmware/deliver/openblt.bin ]; then + echo "Taking .srec under different name" # srec is the only format used by OpenBLT host tools - cp firmware/build/rusefi_update.srec $FOLDER + cp firmware/build/rusefi.srec $FOLDER/rusefi_update.srec +else + echo "Do not need .srec" fi +ls -l $FOLDER [ -e firmware/deliver/rusefi.bin ] || { echo "$SCRIPT_NAME: rusefi.bin not found"; exit 1; }