From 8c72fdfd93366ddee903c84481b35f7ae7122c30 Mon Sep 17 00:00:00 2001 From: Andrey Date: Fri, 30 Jul 2021 16:23:01 -0400 Subject: [PATCH] RUSEFI MSD to contain bundle-specific URL #2848 refactoring and progress --- firmware/gen_signature.sh | 3 ++- firmware/hw_layer/mass_storage/create_ini_image.sh | 4 ++-- .../hw_layer/mass_storage/create_ini_image_compressed.sh | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/firmware/gen_signature.sh b/firmware/gen_signature.sh index c3f788c4fd..7751040767 100755 --- a/firmware/gen_signature.sh +++ b/firmware/gen_signature.sh @@ -10,7 +10,8 @@ echo "Generating signature for ${SHORT_BOARDNAME}" # generate a unique signature date=`TZ=Europe/London date +"%Y.%m.%d"` -echo "#define SIGNATURE_DATE $date" > ${SIGNATURE_FILE_NAME} +echo "// Generated by gen_signature.sh" > ${SIGNATURE_FILE_NAME} +echo "#define SIGNATURE_DATE $date" >> ${SIGNATURE_FILE_NAME} echo "#define SIGNATURE_BOARD ${SHORT_BOARDNAME}" >> ${SIGNATURE_FILE_NAME} echo "// SIGNATURE_HASH is a built-in variable generated by ConfigDefinition.jar" >> ${SIGNATURE_FILE_NAME} diff --git a/firmware/hw_layer/mass_storage/create_ini_image.sh b/firmware/hw_layer/mass_storage/create_ini_image.sh index f26ba537a4..ee9b18b0af 100755 --- a/firmware/hw_layer/mass_storage/create_ini_image.sh +++ b/firmware/hw_layer/mass_storage/create_ini_image.sh @@ -10,7 +10,6 @@ SHORT_BOARDNAME=$4 echo "ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME" - rm -f rusefi.zip ramdisk_image.h # copy *count*KB of zeroes @@ -18,7 +17,8 @@ dd if=/dev/zero of=ramdisk.image bs=1024 count=$FS_SIZE # create a FAT filesystem inside, name it RUSEFI mkfs.fat ramdisk.image -fatlabel ramdisk.image "RUSEFI $SHORT_BOARDNAME" +# labels can be no longer than 11 characters +fatlabel ramdisk.image RUSEFI # -j option dumps all files in the root of the zip (instead of inside directories) zip -j rusefi.ini.zip $FULL_INI diff --git a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh index e37bbea1ef..1157730e33 100755 --- a/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh +++ b/firmware/hw_layer/mass_storage/create_ini_image_compressed.sh @@ -2,12 +2,14 @@ # fail on error set -e -RUSEFI MSD to contain bundle-specific URL #2848 + FULL_INI=$1 H_OUTPUT=$2 FS_SIZE=$3 SHORT_BOARDNAME=$4 +echo "ini $FULL_INI to $H_OUTPUT size $FS_SIZE for $SHORT_BOARDNAME" + rm -f rusefi.zip ramdisk_image.h # copy *count*KB of zeroes @@ -15,6 +17,7 @@ dd if=/dev/zero of=ramdisk.image bs=1024 count=$FS_SIZE # create a FAT filesystem inside, name it RUSEFI mkfs.fat ramdisk.image +# labels can be no longer than 11 characters fatlabel ramdisk.image RUSEFI