~aleteoryx/muditaos: [MOS-783] Change boot.bin to os.bin

6 files changed, 7 insertions(+), 7 deletions(-)

M cmake/modules/AddBootBin.cmake
M cmake/modules/AddVersionJson.cmake
M image/user/boot.json
M module-utils/bootconfig/src/bootconfig.cpp
M module-vfs/paths/include/purefs/filesystem_paths.hpp
M products/PurePhone/BinaryAssetsVersions.cmake

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

@@ 1,5 1,5 @@
 function(add_boot_bin SOURCE_TARGET)
-    set(BIN_FILE ${SYSROOT_PATH}/system_a/bin/boot.bin)
+    set(BIN_FILE ${SYSROOT_PATH}/system_a/bin/os.bin)
 
     set_target_properties(
             ${SOURCE_TARGET}


@@ 10,7 10,7 @@ function(add_boot_bin SOURCE_TARGET)
     if (ENABLE_SECURE_BOOT)
         IF(EXISTS ${SIGN_CLIENT_PATH}/signclient.py)
             add_custom_command(
-                COMMENT "Generate signed boot.bin (Secure Boot)"
+                COMMENT "Generate signed os.bin (Secure Boot)"
                 OUTPUT ${BIN_FILE}
                 DEPENDS ${SOURCE_TARGET}
                 COMMAND python3 ${SIGN_CLIENT_PATH}/signclient.py --in_file $<TARGET_FILE:${SOURCE_TARGET}> --out_file=${BIN_FILE} --keystore ${KEYSTORE} --keyslot ${KEYSLOT} --server ${SERVER} --login ${LOGIN}

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

@@ 6,7 6,7 @@ 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=boot.bin
+            -DBOOT_FILENAME=os.bin
             -DBOOT_FILE=$<TARGET_PROPERTY:${SOURCE_TARGET},BIN_FILE>
             -DBOOT_VERSION=${PROJECT_VERSION}
             -DRECOVERY_FILENAME=recovery.bin

M image/user/boot.json => image/user/boot.json +1 -1

@@ 16,7 16,7 @@
             "active": "a",
             "boot_attempts_max": "10"
         },
-        "os": "boot.bin",
+        "os": "os.bin",
         "recovery": "recovery.bin",
         "bin_dir": "bin",
         "update_dir": "/user/update"

M module-utils/bootconfig/src/bootconfig.cpp => module-utils/bootconfig/src/bootconfig.cpp +1 -1

@@ 105,7 105,7 @@ namespace boot
             return true;
         }
         else {
-            m_os_image     = purefs::file::boot_bin;
+            m_os_image     = purefs::file::os_bin;
             m_os_root_path = purefs::dir::getSystemDiskPath();
             m_boot_json    = bootJsonPath;
             m_timestamp    = utils::time::getCurrentTimestamp().str("%c");

M module-vfs/paths/include/purefs/filesystem_paths.hpp => module-vfs/paths/include/purefs/filesystem_paths.hpp +1 -1

@@ 31,7 31,7 @@ namespace purefs
     namespace file
     {
         constexpr inline auto boot_json    = "boot.json";
-        constexpr inline auto boot_bin     = "boot.bin";
+        constexpr inline auto os_bin       = "os.bin";
         constexpr inline auto version_json = "version.json";
     } // namespace file

M products/PurePhone/BinaryAssetsVersions.cmake => products/PurePhone/BinaryAssetsVersions.cmake +1 -1

@@ 1,7 1,7 @@
 # This file sets versions of downloaded binaries for release packaging purposes
 
 if( NOT DEFINED ECOBOOT_BIN_VERSION)
-    set(ECOBOOT_BIN_VERSION 1.1.2 CACHE STRING "bootloader binary version to download from bootloader release page")
+    set(ECOBOOT_BIN_VERSION 2.0.0 CACHE STRING "bootloader binary version to download from bootloader release page")
 endif()
 
 if (NOT DEFINED RECOVERY_BIN_VERSION)