diff --git a/firmware/config/boards/at_start_f435/compile_at_start_f435.sh b/firmware/config/boards/at_start_f435/compile_at_start_f435.sh index d8af32b9d0..8839124f95 100755 --- a/firmware/config/boards/at_start_f435/compile_at_start_f435.sh +++ b/firmware/config/boards/at_start_f435/compile_at_start_f435.sh @@ -5,4 +5,4 @@ SCRIPT_NAME="compile_at_start_f435.sh" echo "Entering $SCRIPT_NAME" -bash ../common_make.sh config/boards/at_start_f435/meta-info.env +bash ../common_script.sh config/boards/at_start_f435/meta-info.env diff --git a/firmware/config/boards/atlas/compile_atlas.sh b/firmware/config/boards/atlas/compile_atlas.sh index 1c9a7efce1..addbd49509 100755 --- a/firmware/config/boards/atlas/compile_atlas.sh +++ b/firmware/config/boards/atlas/compile_atlas.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/atlas/meta-info.env +bash ../common_script.sh config/boards/atlas/meta-info.env diff --git a/firmware/config/boards/common_make.bat b/firmware/config/boards/common_make.bat deleted file mode 100644 index 0bf8c60593..0000000000 --- a/firmware/config/boards/common_make.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -sh.exe common_make.sh %1 diff --git a/firmware/config/boards/common_make.sh b/firmware/config/boards/common_make.sh deleted file mode 100755 index 2e7e7205b4..0000000000 --- a/firmware/config/boards/common_make.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -# -# historically current directory for bundle builder was a sub-folder of 'config/boards/' -# this script is just a facade for more flexible script which assume invocation from firmware directory -# - -BOARD_META_PATH=$1 - -cd ../../.. - -bash config/boards/common_script.sh $BOARD_META_PATH diff --git a/firmware/config/boards/cypress/compile_cypress.sh b/firmware/config/boards/cypress/compile_cypress.sh index 2989731dee..a7671db448 100755 --- a/firmware/config/boards/cypress/compile_cypress.sh +++ b/firmware/config/boards/cypress/compile_cypress.sh @@ -2,4 +2,4 @@ echo "Compiling for Cypress FM4 S6E2CxAH" -bash ../common_make.sh config/boards/cypress/meta-info.env +bash ../common_script.sh config/boards/cypress/meta-info.env diff --git a/firmware/config/boards/f407-discovery/compile_f407-discovery.sh b/firmware/config/boards/f407-discovery/compile_f407-discovery.sh index 2fa82fd3a2..27053c4b9a 100755 --- a/firmware/config/boards/f407-discovery/compile_f407-discovery.sh +++ b/firmware/config/boards/f407-discovery/compile_f407-discovery.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/f407-discovery/meta-info.env +bash ../common_script.sh config/boards/f407-discovery/meta-info.env diff --git a/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh b/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh index e2fa328afd..be38101765 100755 --- a/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh +++ b/firmware/config/boards/f407-discovery/compile_f407-discovery_debug.sh @@ -1,3 +1,4 @@ #!/bin/bash -bash ../common_make.sh config/boards/f407-discovery/meta-info-f407-discovery_debug.env +bash ../common_script.sh config/boards/f407-discovery/meta-info-f407-discovery_debug.env + diff --git a/firmware/config/boards/f429-208/compile_f429-208.sh b/firmware/config/boards/f429-208/compile_f429-208.sh index bd310fc79e..df49aa0391 100755 --- a/firmware/config/boards/f429-208/compile_f429-208.sh +++ b/firmware/config/boards/f429-208/compile_f429-208.sh @@ -2,4 +2,4 @@ #-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" -bash ../common_make.sh config/boards/f429-208/meta-info.env +bash ../common_script.sh config/boards/f429-208/meta-info.env diff --git a/firmware/config/boards/f429-discovery/compile_f429-discovery.sh b/firmware/config/boards/f429-discovery/compile_f429-discovery.sh index fb370463b3..d5fd60cfc3 100755 --- a/firmware/config/boards/f429-discovery/compile_f429-discovery.sh +++ b/firmware/config/boards/f429-discovery/compile_f429-discovery.sh @@ -2,4 +2,4 @@ #-DDUMMY -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE" -bash ../common_make.sh config/boards/f429-discovery/meta-info.env +bash ../common_script.sh config/boards/f429-discovery/meta-info.env diff --git a/firmware/config/boards/f469-discovery/compile_f469-discovery.sh b/firmware/config/boards/f469-discovery/compile_f469-discovery.sh index 69e0e8e0f4..5a93121288 100644 --- a/firmware/config/boards/f469-discovery/compile_f469-discovery.sh +++ b/firmware/config/boards/f469-discovery/compile_f469-discovery.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/f469-discovery/meta-info.env +bash ../common_script.sh config/boards/f469-discovery/meta-info.env diff --git a/firmware/config/boards/frankenso_na6/compile_frankenso_na6.sh b/firmware/config/boards/frankenso_na6/compile_frankenso_na6.sh index 56678aac15..6579e295d1 100644 --- a/firmware/config/boards/frankenso_na6/compile_frankenso_na6.sh +++ b/firmware/config/boards/frankenso_na6/compile_frankenso_na6.sh @@ -9,4 +9,4 @@ FW_ID_ENV=frankensoNA6 # while humans want to use second cam input asap https://rusefi.com/forum/viewtopic.php?f=4&t=2343 # -bash ../common_make.sh config/boards/frankenso_na6/meta-info.env +bash ../common_script.sh config/boards/frankenso_na6/meta-info.env diff --git a/firmware/config/boards/hellen/alphax-2chan/compile_firmware.sh b/firmware/config/boards/hellen/alphax-2chan/compile_firmware.sh index 86670cd462..c6855d54c9 100644 --- a/firmware/config/boards/hellen/alphax-2chan/compile_firmware.sh +++ b/firmware/config/boards/hellen/alphax-2chan/compile_firmware.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-2chan/meta-info.env +bash ../common_script.sh config/boards/hellen/alphax-2chan/meta-info.env diff --git a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh index 62f8e89cd7..41c44de9c9 100755 --- a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh +++ b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan.env +bash ../common_script.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan.env diff --git a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh index daafd2b50c..a208abf6f2 100755 --- a/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh +++ b/firmware/config/boards/hellen/alphax-4chan/compile_alphax-4chan_f7.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan_f7.env +bash ../common_script.sh config/boards/hellen/alphax-4chan/meta-info-alphax-4chan_f7.env diff --git a/firmware/config/boards/hellen/alphax-8chan-revA/compile_alphax-8chan-revA.sh b/firmware/config/boards/hellen/alphax-8chan-revA/compile_alphax-8chan-revA.sh index 8bc83c94d5..5684d077bf 100755 --- a/firmware/config/boards/hellen/alphax-8chan-revA/compile_alphax-8chan-revA.sh +++ b/firmware/config/boards/hellen/alphax-8chan-revA/compile_alphax-8chan-revA.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan-revA/meta-info.env +bash ../common_script.sh config/boards/hellen/alphax-8chan-revA/meta-info.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh index 10fb1d3c7f..ca82da9b67 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan.env +bash ../common_script.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh index 1344671080..b3ba6aeff1 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_debug.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env +bash ../common_script.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_debug.env diff --git a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh index 4ba7b13782..25355237f4 100755 --- a/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh +++ b/firmware/config/boards/hellen/alphax-8chan/compile_alphax-8chan_f7.sh @@ -3,4 +3,4 @@ # export USE_OPENBLT=yes cd .. -bash ../common_make.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_f7.env +bash ../common_script.sh config/boards/hellen/alphax-8chan/meta-info-alphax-8chan_f7.env diff --git a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh index 52fd8dd995..a71c99d6bc 100755 --- a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh +++ b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17.env \ No newline at end of file +bash ../common_script.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17.env \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh index 9a628b43bf..270f9bf90a 100755 --- a/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh +++ b/firmware/config/boards/hellen/hellen-112-17/compile_hellen-112-17_debug.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env +bash ../common_script.sh config/boards/hellen/hellen-112-17/meta-info-hellen-112-17_debug.env diff --git a/firmware/config/boards/hellen/hellen-gm-e67/compile_hellen-gm-e67.sh b/firmware/config/boards/hellen/hellen-gm-e67/compile_hellen-gm-e67.sh index 3f44bc1b78..44fc59f650 100644 --- a/firmware/config/boards/hellen/hellen-gm-e67/compile_hellen-gm-e67.sh +++ b/firmware/config/boards/hellen/hellen-gm-e67/compile_hellen-gm-e67.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-gm-e67/meta-info.env \ No newline at end of file +bash ../common_script.sh config/boards/hellen/hellen-gm-e67/meta-info.env \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh index 18c15bdf2f..beb7a2bfaa 100755 --- a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh +++ b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k.env +bash ../common_script.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k.env diff --git a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh index c4c67283f3..729adafa6a 100644 --- a/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh +++ b/firmware/config/boards/hellen/hellen-honda-k/compile_hellen-honda-k_debug.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env +bash ../common_script.sh config/boards/hellen/hellen-honda-k/meta-info-hellen-honda-k_debug.env diff --git a/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh b/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh index c7a5926fbf..d6520113f2 100644 --- a/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh +++ b/firmware/config/boards/hellen/hellen-nb1/compile_hellen-nb1.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen-nb1/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen-nb1/meta-info.env diff --git a/firmware/config/boards/hellen/hellen121nissan/compile_firmware.sh b/firmware/config/boards/hellen/hellen121nissan/compile_firmware.sh index 5b8a18a129..cc42bf7ab6 100644 --- a/firmware/config/boards/hellen/hellen121nissan/compile_firmware.sh +++ b/firmware/config/boards/hellen/hellen121nissan/compile_firmware.sh @@ -3,4 +3,4 @@ # export USE_OPENBLT=yes cd .. -bash ../common_make.sh config/boards/hellen/hellen121nissan/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen121nissan/meta-info.env diff --git a/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh b/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh index 4c4456cc59..8378ab44c8 100755 --- a/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh +++ b/firmware/config/boards/hellen/hellen121vag/compile_hellen121vag.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen121vag/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen121vag/meta-info.env diff --git a/firmware/config/boards/hellen/hellen128/compile_hellen128.sh b/firmware/config/boards/hellen/hellen128/compile_hellen128.sh index 02d1a2692a..64114d95c6 100644 --- a/firmware/config/boards/hellen/hellen128/compile_hellen128.sh +++ b/firmware/config/boards/hellen/hellen128/compile_hellen128.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen128/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen128/meta-info.env diff --git a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh index fa8d7f70f0..35fd8d927c 100755 --- a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh +++ b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai.env +bash ../common_script.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai.env diff --git a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh index ab508dcd36..63c935edd8 100644 --- a/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh +++ b/firmware/config/boards/hellen/hellen154hyundai/compile_hellen154hyundai_f7.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai_f7.env +bash ../common_script.sh config/boards/hellen/hellen154hyundai/meta-info-hellen154hyundai_f7.env diff --git a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh index acc523547d..e2971be862 100644 --- a/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh +++ b/firmware/config/boards/hellen/hellen64_miataNA6_94/compile_hellenNA6.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen64_miataNA6_94/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen64_miataNA6_94/meta-info.env diff --git a/firmware/config/boards/hellen/hellen72/compile_hellen72.sh b/firmware/config/boards/hellen/hellen72/compile_hellen72.sh index b44b953371..c910001a0d 100644 --- a/firmware/config/boards/hellen/hellen72/compile_hellen72.sh +++ b/firmware/config/boards/hellen/hellen72/compile_hellen72.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen72/meta-info.env \ No newline at end of file +bash ../common_script.sh config/boards/hellen/hellen72/meta-info.env \ No newline at end of file diff --git a/firmware/config/boards/hellen/hellen81/compile_hellen81.sh b/firmware/config/boards/hellen/hellen81/compile_hellen81.sh index 0595a0614d..ecb5920c49 100755 --- a/firmware/config/boards/hellen/hellen81/compile_hellen81.sh +++ b/firmware/config/boards/hellen/hellen81/compile_hellen81.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen81/meta-info.env +bash ../common_script.sh config/boards/hellen/hellen81/meta-info.env diff --git a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh index 1c42af8bf3..b1eb7dcf10 100755 --- a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh +++ b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw.env +bash ../common_script.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw.env diff --git a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh index d9657b273f..2800c77e01 100644 --- a/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh +++ b/firmware/config/boards/hellen/hellen88bmw/compile_hellen88bmw_avr.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env +bash ../common_script.sh config/boards/hellen/hellen88bmw/meta-info-hellen88bmw_avr.env diff --git a/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh b/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh index f9c7719536..580b906777 100755 --- a/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh +++ b/firmware/config/boards/hellen/hellenNA8_96/compile_hellenNA8_96.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/hellenNA8_96/meta-info.env +bash ../common_script.sh config/boards/hellen/hellenNA8_96/meta-info.env diff --git a/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh b/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh index 2da31f10f7..c6a94a7318 100755 --- a/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh +++ b/firmware/config/boards/hellen/small-can-board/compile_small-can-board.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/small-can-board/meta-info-small-can-board.env +bash ../common_script.sh config/boards/hellen/small-can-board/meta-info-small-can-board.env diff --git a/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh b/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh index 86040d72a7..f5fa1f2e6e 100644 --- a/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh +++ b/firmware/config/boards/hellen/small-can-board/compile_small-can-board_debug.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env +bash ../common_script.sh config/boards/hellen/small-can-board/meta-info-small-can-board_debug.env diff --git a/firmware/config/boards/hellen/uaefi/compile_firmware.sh b/firmware/config/boards/hellen/uaefi/compile_firmware.sh index 4e3e5f8867..08fd9f1eca 100644 --- a/firmware/config/boards/hellen/uaefi/compile_firmware.sh +++ b/firmware/config/boards/hellen/uaefi/compile_firmware.sh @@ -1,4 +1,4 @@ #!/bin/bash cd .. -bash ../common_make.sh config/boards/hellen/uaefi/meta-info.env +bash ../common_script.sh config/boards/hellen/uaefi/meta-info.env diff --git a/firmware/config/boards/kinetis/compile_kinetis.sh b/firmware/config/boards/kinetis/compile_kinetis.sh index df83d4018a..143a137eca 100755 --- a/firmware/config/boards/kinetis/compile_kinetis.sh +++ b/firmware/config/boards/kinetis/compile_kinetis.sh @@ -2,4 +2,4 @@ echo "Compiling for Kinetis MKE16F512" -bash ../common_make.sh config/boards/kinetis/meta-info.env +bash ../common_script.sh config/boards/kinetis/meta-info.env diff --git a/firmware/config/boards/m74_9/compile_m74_9.sh b/firmware/config/boards/m74_9/compile_m74_9.sh index fe86afd7ed..355dd22236 100755 --- a/firmware/config/boards/m74_9/compile_m74_9.sh +++ b/firmware/config/boards/m74_9/compile_m74_9.sh @@ -5,4 +5,4 @@ SCRIPT_NAME="compile_m74_9.sh" echo "Entering $SCRIPT_NAME" -bash ../common_make.sh config/boards/m74_9/meta-info.env +bash ../common_script.sh config/boards/m74_9/meta-info.env diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh index 0ac958a37a..cf69f44922 100755 --- a/firmware/config/boards/microrusefi/compile_mre_f4.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh @@ -5,4 +5,4 @@ # ./gen_config_board.sh config/boards/microrusefi mre_f4 # -bash ../common_make.sh config/boards/microrusefi/meta-info-mre_f4.env +bash ../common_script.sh config/boards/microrusefi/meta-info-mre_f4.env diff --git a/firmware/config/boards/microrusefi/compile_mre_f7.sh b/firmware/config/boards/microrusefi/compile_mre_f7.sh index aea57697c9..c514b82032 100755 --- a/firmware/config/boards/microrusefi/compile_mre_f7.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f7.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/microrusefi/meta-info-mre_f7.env +bash ../common_script.sh config/boards/microrusefi/meta-info-mre_f7.env diff --git a/firmware/config/boards/nucleo_f413/compile_stm32f413_nucleo.sh b/firmware/config/boards/nucleo_f413/compile_stm32f413_nucleo.sh index 91f884db91..4f9ffabf3e 100644 --- a/firmware/config/boards/nucleo_f413/compile_stm32f413_nucleo.sh +++ b/firmware/config/boards/nucleo_f413/compile_stm32f413_nucleo.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/nucleo_f413/meta-info.env +bash ../common_script.sh config/boards/nucleo_f413/meta-info.env diff --git a/firmware/config/boards/nucleo_f429/compile_stm32f429_nucleo.sh b/firmware/config/boards/nucleo_f429/compile_stm32f429_nucleo.sh index f899930986..0c61f19af8 100755 --- a/firmware/config/boards/nucleo_f429/compile_stm32f429_nucleo.sh +++ b/firmware/config/boards/nucleo_f429/compile_stm32f429_nucleo.sh @@ -5,4 +5,4 @@ SCRIPT_NAME="compile_nucleo_f429.sh" echo "Entering $SCRIPT_NAME" -bash ../common_make.sh config/boards/nucleo_f429/meta-info.env +bash ../common_script.sh config/boards/nucleo_f429/meta-info.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh index f7a1af15fe..c7a6eb3296 100755 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo.sh @@ -7,4 +7,4 @@ echo "Entering $SCRIPT_NAME" # Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS -bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo.env +bash ../common_script.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh index 6edda0ee70..46a7746b77 100644 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_nucleo_debug.sh @@ -7,4 +7,4 @@ echo "Entering $SCRIPT_NAME" # Nucleo boards use MCO signal from St-Link and NOT oscillator - these need STM32_HSE_BYPASS -bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env +bash ../common_script.sh config/boards/nucleo_f767/meta-info-stm32f767_nucleo_debug.env diff --git a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh index 3e21cd90fe..cfdf597290 100755 --- a/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh +++ b/firmware/config/boards/nucleo_f767/compile_stm32f767_osc.sh @@ -2,4 +2,4 @@ # STM32F767 version of the firmware for F767ZI chip NOT on Nucleo board, with a real oscillator -bash ../common_make.sh config/boards/nucleo_f767/meta-info-stm32f767_osc.env +bash ../common_script.sh config/boards/nucleo_f767/meta-info-stm32f767_osc.env diff --git a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh index f557e7016a..76e3bbd5e4 100755 --- a/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh +++ b/firmware/config/boards/nucleo_h743/compile_stm32h743_nucleo.sh @@ -5,4 +5,4 @@ SCRIPT_NAME="compile_nucleo_h743.sh" echo "Entering $SCRIPT_NAME" -bash ../common_make.sh config/boards/nucleo_h743/meta-info.env +bash ../common_script.sh config/boards/nucleo_h743/meta-info.env diff --git a/firmware/config/boards/prometheus/f405/compile_prometheus_405.sh b/firmware/config/boards/prometheus/f405/compile_prometheus_405.sh index e12ba5b186..21ee65879c 100644 --- a/firmware/config/boards/prometheus/f405/compile_prometheus_405.sh +++ b/firmware/config/boards/prometheus/f405/compile_prometheus_405.sh @@ -1,5 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash # STM32F405 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215 cd .. -bash ../common_make.sh config/boards/prometheus/f405/meta-info.env +bash ../common_script.sh config/boards/prometheus/f405/meta-info.env diff --git a/firmware/config/boards/prometheus/f469/compile_prometheus_469.sh b/firmware/config/boards/prometheus/f469/compile_prometheus_469.sh index d25949d50e..58fc5b379a 100644 --- a/firmware/config/boards/prometheus/f469/compile_prometheus_469.sh +++ b/firmware/config/boards/prometheus/f469/compile_prometheus_469.sh @@ -1,5 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash # STM32F469 version of the firmware for https://rusefi.com/forum/viewtopic.php?f=4&t=1215 cd .. -bash ../common_make.sh config/boards/prometheus/f469/meta-info.env +bash ../common_script.sh config/boards/prometheus/f469/meta-info.env diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh index 87514a4f7e..56d7310baf 100755 --- a/firmware/config/boards/proteus/compile_proteus_f4.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f4.env diff --git a/firmware/config/boards/proteus/compile_proteus_f4_debug.sh b/firmware/config/boards/proteus/compile_proteus_f4_debug.sh index 75c23faeb2..60e7c6d41c 100644 --- a/firmware/config/boards/proteus/compile_proteus_f4_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4_debug.sh @@ -1,3 +1,4 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4_debug.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f4_debug.env + diff --git a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh index fc4269a555..1b92807d39 100755 --- a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f4_hardware_QC_special_build.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7.sh b/firmware/config/boards/proteus/compile_proteus_f7.sh index fa853431fa..2ec75dd8ad 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f7.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7_debug.sh b/firmware/config/boards/proteus/compile_proteus_f7_debug.sh index 490dff07c9..3eb018065d 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7_debug.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7_debug.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f7_debug.env diff --git a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh index 9f80340648..d5aa0a2eea 100755 --- a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_f7_hardware_QC_special_build.env diff --git a/firmware/config/boards/proteus/compile_proteus_h7.sh b/firmware/config/boards/proteus/compile_proteus_h7.sh index 46332dceed..a75643b417 100755 --- a/firmware/config/boards/proteus/compile_proteus_h7.sh +++ b/firmware/config/boards/proteus/compile_proteus_h7.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_h7.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_h7.env diff --git a/firmware/config/boards/proteus/compile_proteus_h7_debug.sh b/firmware/config/boards/proteus/compile_proteus_h7_debug.sh index f527f69382..3c6a8a8017 100644 --- a/firmware/config/boards/proteus/compile_proteus_h7_debug.sh +++ b/firmware/config/boards/proteus/compile_proteus_h7_debug.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/proteus/meta-info-proteus_h7_debug.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_h7_debug.env diff --git a/firmware/config/boards/proteus/compile_proteus_legacy.sh b/firmware/config/boards/proteus/compile_proteus_legacy.sh index 53fd04941a..78d1bec613 100755 --- a/firmware/config/boards/proteus/compile_proteus_legacy.sh +++ b/firmware/config/boards/proteus/compile_proteus_legacy.sh @@ -2,4 +2,4 @@ # Use this script for Proteus v0.1/0.2 (boards where vbat was on ADC3) -bash ../common_make.sh config/boards/proteus/meta-info-proteus_legacy.env +bash ../common_script.sh config/boards/proteus/meta-info-proteus_legacy.env diff --git a/firmware/config/boards/s105/compile_s105.sh b/firmware/config/boards/s105/compile_s105.sh index ec524f1f40..2481f16d78 100755 --- a/firmware/config/boards/s105/compile_s105.sh +++ b/firmware/config/boards/s105/compile_s105.sh @@ -1,3 +1,4 @@ #!/bin/bash -bash ../common_make.sh config/boards/s105/meta-info.env +bash ../common_script.sh config/boards/s105/meta-info.env + diff --git a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh index 87457957ab..70089ba9b5 100755 --- a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh +++ b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env +bash ../common_script.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7.env diff --git a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh index 9782b0c462..11a62a0aa5 100644 --- a/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh +++ b/firmware/config/boards/subaru_eg33/compile_subaru_eg33_f7_no_bl.sh @@ -10,4 +10,4 @@ # This is no-bootloader version #export USE_OPENBLT=yes -bash ../common_make.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env +bash ../common_script.sh config/boards/subaru_eg33/meta-info-subaru_eg33_f7_no_bl.env diff --git a/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh b/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh index f04cb17205..4ad833d326 100755 --- a/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh +++ b/firmware/config/boards/tdg-pdm8/compile_tdg-pdm8.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/tdg-pdm8/meta-info.env +bash ../common_script.sh config/boards/tdg-pdm8/meta-info.env diff --git a/firmware/config/boards/test-build-guards/compile_t-b-g.sh b/firmware/config/boards/test-build-guards/compile_t-b-g.sh index 30d8b1071f..3d4f61a6ff 100755 --- a/firmware/config/boards/test-build-guards/compile_t-b-g.sh +++ b/firmware/config/boards/test-build-guards/compile_t-b-g.sh @@ -1,3 +1,3 @@ #!/bin/bash -bash ../common_make.sh config/boards/test-build-guards/meta-info.env +bash ../common_script.sh config/boards/test-build-guards/meta-info.env