~aleteoryx/muditaos: [MOS-835] Fix version.json entry

4 files changed, 11 insertions(+), 11 deletions(-)

M cmake/modules/AddVersionJson.cmake
M cmake/modules/ConfigureVersionJson.cmake
M config/version.json.cmake_template
M config/version_rt1051.json.cmake_template

M cmake/modules/AddVersionJson.cmake => cmake/modules/AddVersionJson.cmake +3 -3

@@ 6,9 6,9 @@ function(add_version_rt1051_json SOURCE_TARGET)
             -DDST_FILE=${CMAKE_BINARY_DIR}/${SOURCE_TARGET}-version.json
             -DBOOTLOADER_FILENAME=ecoboot.bin
             -DBOOTLOADER_FILE=${SYSROOT_BIN_PATH}/ecoboot.bin
-            -DBOOT_FILENAME=os.bin
-            -DBOOT_FILE=$<TARGET_PROPERTY:${SOURCE_TARGET},BIN_FILE>
-            -DBOOT_VERSION=${PROJECT_VERSION}
+            -DOS_FILENAME=os.bin
+            -DOS_FILE=$<TARGET_PROPERTY:${SOURCE_TARGET},BIN_FILE>
+            -DOS_VERSION=${PROJECT_VERSION}
             -DRECOVERY_FILENAME=recovery.bin
             -DRECOVERY_FILE=${SYSROOT_BIN_PATH}/recovery.bin
             -DOS_VERSION_MAJOR=${OS_VERSION_MAJOR}

M cmake/modules/ConfigureVersionJson.cmake => cmake/modules/ConfigureVersionJson.cmake +2 -2

@@ 4,8 4,8 @@ include(Version)
 if (NOT ${BOOTLOADER_FILE} STREQUAL "")
     file(MD5 ${BOOTLOADER_FILE} BOOTLOADER_MD5SUM)
 endif()
-if (NOT ${BOOT_FILE} STREQUAL "")
-    file(MD5 ${BOOT_FILE} BOOT_MD5SUM)
+if (NOT ${OS_FILE} STREQUAL "")
+    file(MD5 ${OS_FILE} OS_MD5SUM)
 endif()
 if (NOT ${RECOVERY_FILE} STREQUAL "")
     file(MD5 ${RECOVERY_FILE} RECOVERY_MD5SUM)

M config/version.json.cmake_template => config/version.json.cmake_template +3 -3

@@ 14,11 14,11 @@
         "filename": "@BOOTLOADER_FILENAME@",
         "md5sum":   "@BOOTLOADER_MD5SUM@"
     },
-    "boot":
+    "os":
     {
         "version":  "@OS_VERSION_MAJOR@.@OS_VERSION_MINOR@.@OS_VERSION_PATCH@",
-        "filename": "@BOOT_FILENAME@",
-        "md5sum":   "@BOOT_MD5SUM@"
+        "filename": "@OS_FILENAME@",
+        "md5sum":   "@OS_MD5SUM@"
     },
     "recovery":
     {

M config/version_rt1051.json.cmake_template => config/version_rt1051.json.cmake_template +3 -3

@@ 14,11 14,11 @@
         "filename": "@BOOTLOADER_FILENAME@",
         "md5sum":   "@BOOTLOADER_MD5SUM@"
     },
-    "boot":
+    "os":
     {
         "version":  "@OS_VERSION_MAJOR@.@OS_VERSION_MINOR@.@OS_VERSION_PATCH@",
-        "filename": "@BOOT_FILENAME@",
-        "md5sum":   "@BOOT_MD5SUM@"
+        "filename": "@OS_FILENAME@",
+        "md5sum":   "@OS_MD5SUM@"
     },
     "recovery":
     {